← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-04 08:13:04 UTC
  • mfrom: (2384 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110804081304-rlejjpvoos17bjdf
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
67
67
  list.link_in_list((unsigned char*) order, (unsigned char**) &order->next);
68
68
}
69
69
 
70
 
/**
71
 
  LEX_STRING constant for null-string to be used in parser and other places.
72
 
*/
73
 
const LEX_STRING null_lex_str= {NULL, 0};
74
 
 
75
70
Lex_input_stream::Lex_input_stream(Session *session,
76
71
                                   const char* buffer,
77
72
                                   unsigned int length) :
166
161
                  m_cpp_utf8_processed_ptr will be set in the end of the
167
162
                  operation.
168
163
*/
169
 
void Lex_input_stream::body_utf8_append_literal(const LEX_STRING *txt,
 
164
void Lex_input_stream::body_utf8_append_literal(const lex_string_t *txt,
170
165
                                                const char *end_ptr)
171
166
{
172
167
  if (!m_cpp_utf8_processed_ptr)
298
293
}
299
294
 
300
295
/* make a copy of token before ptr and set yytoklen */
301
 
static LEX_STRING get_token(Lex_input_stream *lip, uint32_t skip, uint32_t length)
 
296
static lex_string_t get_token(Lex_input_stream *lip, uint32_t skip, uint32_t length)
302
297
{
303
 
  LEX_STRING tmp;
 
298
  lex_string_t tmp;
304
299
  lip->yyUnget();                       // ptr points now after last token char
305
300
  tmp.length=lip->yytoklen=length;
306
301
  tmp.str= lip->m_session->mem.strdup(lip->get_tok_start() + skip, tmp.length);
317
312
   get_quoted_token yet. But it should be fixed in the
318
313
   future to operate multichar strings (like ucs2)
319
314
*/
320
 
static LEX_STRING get_quoted_token(Lex_input_stream *lip,
 
315
static lex_string_t get_quoted_token(Lex_input_stream *lip,
321
316
                                   uint32_t skip,
322
317
                                   uint32_t length, char quote)
323
318
{
324
 
  LEX_STRING tmp;
 
319
  lex_string_t tmp;
325
320
  lip->yyUnget();                       // ptr points now after last token char
326
321
  tmp.length= lip->yytoklen=length;
327
322
  tmp.str=(char*) lip->m_session->mem.alloc(tmp.length+1);
1568
1563
 
1569
1564
TableList *Select_Lex_Node::add_table_to_list(Session *,
1570
1565
                                              Table_ident *,
1571
 
                                              LEX_STRING *,
 
1566
                                              lex_string_t *,
1572
1567
                                              const bitset<NUM_OF_TABLE_OPTIONS>&,
1573
1568
                                              thr_lock_type,
1574
1569
                                              List<Index_hint> *,
1575
 
                                              LEX_STRING *)
 
1570
                                              lex_string_t *)
1576
1571
{
1577
1572
  return 0;
1578
1573
}