bzr commit into mysql-trunk branch (Georgi.Kodinov:3393)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B11744875-trunk/ based on revid:georgi.kodinov@stripped

 3393 Georgi Kodinov	2011-05-11 [merge]
      merge from upstream

    modified:
      sql/sql_lex.h
=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2011-05-04 07:51:15 +0000
+++ b/sql/sql_lex.h	2011-05-11 11:31:27 +0000
@@ -2049,7 +2049,6 @@ struct LEX: public Query_tables_list
   char *length,*dec,*change;
   LEX_STRING name;
   char *help_arg;
-  char *backup_dir;				/* For RESTORE/BACKUP */
   char* to_log;                                 /* For PURGE MASTER LOGS TO */
   char* x509_subject,*x509_issuer,*ssl_cipher;
   String *wild;

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).