~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to sql/lex.h

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
312
312
  { "MASTER_SSL_CERT",  SYM(MASTER_SSL_CERT_SYM)},
313
313
  { "MASTER_SSL_CIPHER",SYM(MASTER_SSL_CIPHER_SYM)},
314
314
  { "MASTER_SSL_KEY",   SYM(MASTER_SSL_KEY_SYM)},
 
315
  { "MASTER_SSL_VERIFY_SERVER_CERT", SYM(MASTER_SSL_VERIFY_SERVER_CERT_SYM)},
315
316
  { "MASTER_USER",           SYM(MASTER_USER_SYM)},
316
317
  { "MATCH",            SYM(MATCH)},
317
318
  { "MAX_CONNECTIONS_PER_HOUR", SYM(MAX_CONNECTIONS_PER_HOUR)},