← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/lex.h

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/lex.h
276
276
  { "LOGFILE",          SYM(LOGFILE_SYM)},
277
277
  { "LOGS",             SYM(LOGS_SYM)},
278
278
  { "LONG",             SYM(LONG_SYM)},
279
 
  { "LONGBLOB",         SYM(LONGBLOB)},
280
 
  { "LONGTEXT",         SYM(LONGTEXT)},
 
279
  { "LONGBLOB",         SYM(BLOB_SYM)},
 
280
  { "LONGTEXT",         SYM(TEXT_SYM)},
281
281
  { "LOOP",             SYM(LOOP_SYM)},
282
282
  { "LOW_PRIORITY",     SYM(LOW_PRIORITY)},
283
283
  { "MASTER",           SYM(MASTER_SYM)},
299
299
  { "MAX_USER_CONNECTIONS", SYM(MAX_USER_CONNECTIONS_SYM)},
300
300
  { "MAXVALUE",         SYM(MAX_VALUE_SYM)},
301
301
  { "MEDIUM",           SYM(MEDIUM_SYM)},
302
 
  { "MEDIUMBLOB",       SYM(MEDIUMBLOB)},
303
 
  { "MEDIUMTEXT",       SYM(MEDIUMTEXT)},
 
302
  { "MEDIUMBLOB",       SYM(BLOB_SYM)},
 
303
  { "MEDIUMTEXT",       SYM(TEXT_SYM)},
304
304
  { "MERGE",            SYM(MERGE_SYM)},
305
305
  { "MICROSECOND",      SYM(MICROSECOND_SYM)},
306
306
  { "MIGRATE",          SYM(MIGRATE_SYM)},
478
478
  { "TIMESTAMP",        SYM(TIMESTAMP)},
479
479
  { "TIMESTAMPADD",     SYM(TIMESTAMP_ADD)},
480
480
  { "TIMESTAMPDIFF",    SYM(TIMESTAMP_DIFF)},
481
 
  { "TINYBLOB",         SYM(TINYBLOB)},
 
481
  { "TINYBLOB",         SYM(BLOB_SYM)},
482
482
  { "TINYINT",          SYM(TINYINT)},
483
 
  { "TINYTEXT",         SYM(TINYTEXT)},
 
483
  { "TINYTEXT",         SYM(TEXT_SYM)},
484
484
  { "TO",               SYM(TO_SYM)},
485
485
  { "TRAILING",         SYM(TRAILING)},
486
486
  { "TRANSACTION",      SYM(TRANSACTION_SYM)},