← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Mark Atwood
  • Date: 2011-07-26 19:55:19 UTC
  • mfrom: (2371.1.3 drizzle-fix-fedora15)
  • Revision ID: me@mark.atwood.name-20110726195519-nt8m1gsmvjbhco1c
merge lp:~brianaker/drizzle/fedora-fix-3

Show diffs side-by-side

added added

removed removed

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