Commit e10aed52 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337


sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 5f0a5dc0 96aef62c

mysql-test/t/im_instance_conf.imtest

+27 −27
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
# Check that the configuration file contains only instances that we expect.



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



# Check that mysqld1 is reported as running.
@@ -79,7 +79,7 @@ CREATE INSTANCE mysqld3 
SHOW INSTANCES;

 

--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



# Check that CREATE INSTANCE fails for existing instance. Let's all three
@@ -101,7 +101,7 @@ CREATE INSTANCE mysqld3; 
#   - without values;



--echo --------------------------------------------------------------------

--exec grep nonguarded $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^nonguarded\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld4
@@ -112,15 +112,15 @@ CREATE INSTANCE mysqld4 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep nonguarded $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^nonguarded\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



#   - with value;



--echo --------------------------------------------------------------------

--exec grep test-A $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-A\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep test-B $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-B\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld5
@@ -132,9 +132,9 @@ CREATE INSTANCE mysqld5 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep test-A $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-A\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-B $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-B\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



# Check that CREATE INSTANCE parses options and handles grammar errors
@@ -144,7 +144,7 @@ SHOW INSTANCES; 
#   - check handling of extra spaces;



--echo --------------------------------------------------------------------

--exec grep test-C $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-C\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld6
@@ -156,17 +156,17 @@ CREATE INSTANCE mysqld6 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep test-C1 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-C1\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-C2 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-C2\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



#   - check handling of grammar error;



--echo --------------------------------------------------------------------

--exec grep test-D $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-D\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep test-E $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-E\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



--error ER_SYNTAX_ERROR
@@ -182,21 +182,21 @@ CREATE INSTANCE mysqld8 test-F = ; 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep test-D $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-D\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep test-E $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-E\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



#   - check parsing of string option values



--echo --------------------------------------------------------------------

--exec grep test-1 $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-1\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep test-2 $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-2\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep test-3 $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-3\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep test-4 $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-4\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



CREATE INSTANCE mysqld9
@@ -233,21 +233,21 @@ CREATE INSTANCE mysqld13 test-bad=' \ '; 
SHOW INSTANCES;



--echo --------------------------------------------------------------------

--exec grep test-1 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-1\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-2 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-2\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-3 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-3\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-4 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-4\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-5 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-5\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-6 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-6\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-7 $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^test-7\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------

--exec grep test-bad $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^test-bad\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

mysql-test/t/im_options.imtest

+24 −24
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
# - check the configuration file;



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



# - check the running instances.
@@ -133,25 +133,25 @@ UNSET mysqld2.server_id = 11; 
SET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc = 0010, mysqld3.ddd = 0020;



--echo --------------------------------------------------------------------

--exec grep aaa $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep bbb $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep ccc $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep ddd $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^ddd\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd;



--echo --------------------------------------------------------------------

--exec grep aaa $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep bbb $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep ccc $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep ddd $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ddd\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



# - check that if some instance name is invalid or the active is active,
@@ -161,22 +161,22 @@ UNSET mysqld2.aaa, mysqld3.bbb, mysqld2.ccc, mysqld3.ddd; 
SET mysqld2.aaa, mysqld3.bbb, mysqld.ccc = 0010;



--echo --------------------------------------------------------------------

--exec grep aaa $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep bbb $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep ccc $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



--error 3015 # ER_INSTANCE_IS_ACTIVE

SET mysqld2.aaa, mysqld3.bbb, mysqld1.ccc = 0010;



--echo --------------------------------------------------------------------

--exec grep aaa $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep bbb $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep ccc $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^ccc\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



# - check that if some instance name is invalid or the active is active,
@@ -186,14 +186,14 @@ SET mysqld2.aaa, mysqld3.bbb, mysqld1.ccc = 0010; 
UNSET mysqld2.server_id, mysqld3.server_id, mysqld.ccc;



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



--error 3015 # ER_INSTANCE_IS_ACTIVE

UNSET mysqld2.server_id, mysqld3.server_id, mysqld1.ccc;



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf;

--echo --------------------------------------------------------------------



DROP INSTANCE mysqld3;
@@ -207,21 +207,21 @@ SET mysqld2 . server_id = 222 ; 
SET   mysqld2  .  server_id  =  222  , mysqld2  .  aaa  , mysqld2  .  bbb  ;



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep aaa $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep bbb $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



UNSET mysqld2  . aaa  ,  mysqld2  .  bbb ;



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------

--exec grep aaa $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^aaa\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------

--exec grep bbb $MYSQLTEST_VARDIR/im.cnf || true;

--exec grep '^bbb\>' $MYSQLTEST_VARDIR/im.cnf || true;

--echo --------------------------------------------------------------------



###########################################################################
@@ -235,7 +235,7 @@ UNSET mysqld2 . aaa , mysqld2 . bbb ; 
#     server_id=SERVER_ID for mysqld2);



--echo --------------------------------------------------------------------

--exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;

--exec grep '^server_id\>' $MYSQLTEST_VARDIR/im.cnf ;

--echo --------------------------------------------------------------------



#   - (for mysqld1) check that the running instance has not been affected:

sql/handler.cc

+5 −5
Original line number Diff line number Diff line
@@ -72,11 +72,11 @@ ulong savepoint_alloc_size= 0; 


static const LEX_STRING sys_table_aliases[]=

{

  {(char*)STRING_WITH_LEN("INNOBASE")},  {(char*)STRING_WITH_LEN("INNODB")},

  {(char*)STRING_WITH_LEN("NDB")},       {(char*)STRING_WITH_LEN("NDBCLUSTER")},

  {(char*)STRING_WITH_LEN("BDB")},       {(char*)STRING_WITH_LEN("BERKELEYDB")},

  {(char*)STRING_WITH_LEN("HEAP")},      {(char*)STRING_WITH_LEN("MEMORY")},

  {(char*)STRING_WITH_LEN("MERGE")},     {(char*)STRING_WITH_LEN("MRG_MYISAM")},

  { C_STRING_WITH_LEN("INNOBASE") },  { C_STRING_WITH_LEN("INNODB") },

  { C_STRING_WITH_LEN("NDB") },       { C_STRING_WITH_LEN("NDBCLUSTER") },

  { C_STRING_WITH_LEN("BDB") },       { C_STRING_WITH_LEN("BERKELEYDB") },

  { C_STRING_WITH_LEN("HEAP") },      { C_STRING_WITH_LEN("MEMORY") },

  { C_STRING_WITH_LEN("MERGE") },     { C_STRING_WITH_LEN("MRG_MYISAM")},

  {NullS, 0}

};

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -1004,7 +1004,7 @@ bool Item_splocal::set_value(THD *thd, sp_rcontext *ctx, Item **it) 
*****************************************************************************/



Item_case_expr::Item_case_expr(int case_expr_id)

  :Item_sp_variable((char *) STRING_WITH_LEN("case_expr")),

  :Item_sp_variable( C_STRING_WITH_LEN("case_expr")),

   m_case_expr_id(case_expr_id)

{

}

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH], 
            def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];

#define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))

extern MY_TMPDIR mysql_tmpdir_list;

extern LEX_STRING command_name[];

extern const LEX_STRING command_name[];

extern const char *first_keyword, *my_localhost, *delayed_user, *binary_keyword;

extern const char **errmesg;			/* Error messages */

extern const char *myisam_recover_options_str;