MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:March 12 2010 1:48pm
Subject:bzr commit into mysql-5.1-telco-6.2 branch (jonas:3086)
View as plain text  
#At file:///home/jonas/src/telco-6.2/ based on revid:jonas@stripped

 3086 Jonas Oreland	2010-03-12
      ndb - post merge 5.1.44 fixes

    modified:
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/t/disabled.def
      sql/sql_yacc.yy
=== modified file 'mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test'
--- a/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2010-03-12 06:06:23 +0000
+++ b/mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test	2010-03-12 13:48:46 +0000
@@ -455,10 +455,10 @@ sync_slave_with_master;
   #SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
   #START SLAVE;
 
-#--echo *** Drop t9  ***
-#connection master;
-#DROP TABLE t9;
-#sync_slave_with_master;
+--echo *** Drop t9  ***
+connection master;
+DROP TABLE t9;
+sync_slave_with_master;
 
 ############################################
 # More columns in slave at middle of table #

=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_innodb.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result	2010-03-12 06:06:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_innodb.result	2010-03-12 13:48:46 +0000
@@ -434,6 +434,8 @@ a	b	c	d	e	f	g	h	i
 1	b1b1b1b1b1b1b1b1	Kyle	0000-00-00 00:00:00	0		NULL		NULL
 2	b1b1b1b1b1b1b1b1	JOE	0000-00-00 00:00:00	0		NULL		NULL
 3	b1b1b1b1b1b1b1b1	QA	0000-00-00 00:00:00	0		NULL		NULL
+*** Drop t9  ***
+DROP TABLE t9;
 *** Create t10 on slave  ***
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl/r/rpl_extraCol_myisam.result'
--- a/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2010-03-12 06:06:23 +0000
+++ b/mysql-test/suite/rpl/r/rpl_extraCol_myisam.result	2010-03-12 13:48:46 +0000
@@ -434,6 +434,8 @@ a	b	c	d	e	f	g	h	i
 1	b1b1b1b1b1b1b1b1	Kyle	0000-00-00 00:00:00	0		NULL		NULL
 2	b1b1b1b1b1b1b1b1	JOE	0000-00-00 00:00:00	0		NULL		NULL
 3	b1b1b1b1b1b1b1b1	QA	0000-00-00 00:00:00	0		NULL		NULL
+*** Drop t9  ***
+DROP TABLE t9;
 *** Create t10 on slave  ***
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result	2010-03-12 06:06:23 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result	2010-03-12 13:48:46 +0000
@@ -431,6 +431,8 @@ set @b1 = concat(@b1,@b1);
 INSERT INTO t9 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
 select * from t9;
 a	b	c	d	e	f	g	h	i
+*** Drop t9  ***
+DROP TABLE t9;
 *** Create t10 on slave  ***
 STOP SLAVE;
 RESET SLAVE;

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2010-03-12 06:06:23 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2010-03-12 13:48:46 +0000
@@ -11,4 +11,4 @@
 ##############################################################################
 
 rpl_ndb_ctype_ucs2_def : bug #34661 rpl_ndb_ctype_ucs2_def fails in 6.2
-rpl_ndb_set_null       : bug #
+rpl_ndb_set_null       : bug #51100

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-03-12 06:06:23 +0000
+++ b/sql/sql_yacc.yy	2010-03-12 13:48:46 +0000
@@ -600,7 +600,7 @@ Item* handle_sql2003_note184_exception(T
 }
 
 
-static bool add_create_index_prepare (LEX *lex, Table_ident *table)
+static bool add_create_index_prepare (LEX *lex, Table_ident *table, enum ha_build_method method)
 {
   lex->sql_command= SQLCOM_CREATE_INDEX;
   if (!lex->current_select->add_table_to_list(lex->thd, table, NULL,
@@ -608,6 +608,7 @@ static bool add_create_index_prepare (LE
     return TRUE;
   lex->alter_info.reset();
   lex->alter_info.flags= ALTER_ADD_INDEX;
+  lex->alter_info.build_method= method;
   lex->col_list.empty();
   lex->change= NullS;
   return FALSE;
@@ -1890,98 +1891,37 @@ create:
                                 $5->table.str);
           }
         }
-	| CREATE build_method opt_unique INDEX_SYM ident key_alg 
-          ON table_ident
-	  {
-	    LEX *lex=Lex;
-	    lex->sql_command= SQLCOM_CREATE_INDEX;
-	    if (!lex->current_select->add_table_to_list(lex->thd, $8,
-							NULL,
-							TL_OPTION_UPDATING))
-	      MYSQL_YYABORT;
-            lex->alter_info.reset();
-            lex->alter_info.flags= ALTER_ADD_INDEX;
-            lex->alter_info.build_method= $2;
-            lex->col_list.empty();
-            lex->change=NullS;
+	| CREATE build_method opt_unique INDEX_SYM ident key_alg ON table_ident
+          {
+            if (add_create_index_prepare(Lex, $8, $2))
+              MYSQL_YYABORT;
           }
           '(' key_list ')' normal_key_options
           {
-            LEX *lex=Lex;
-            Key *key;
-            if ($3 != Key::FULLTEXT && lex->key_create_info.parser_name.str)
-            {
-              my_parse_error(ER(ER_SYNTAX_ERROR));
-              MYSQL_YYABORT;
-            }
-            key= new Key($3, $5.str, &lex->key_create_info, 0,
-                         lex->col_list);
-            if (key == NULL)
+            if (add_create_index(Lex, $3, $5.str))
               MYSQL_YYABORT;
-            lex->alter_info.key_list.push_back(key);
-            lex->col_list.empty();
           }
-	| CREATE build_method fulltext INDEX_SYM ident key_alg 
-          ON table_ident
-	  {
-	    LEX *lex=Lex;
-	    lex->sql_command= SQLCOM_CREATE_INDEX;
-	    if (!lex->current_select->add_table_to_list(lex->thd, $8,
-							NULL,
-							TL_OPTION_UPDATING))
-	      MYSQL_YYABORT;
-            lex->alter_info.reset();
-            lex->alter_info.flags= ALTER_ADD_INDEX;
-            lex->alter_info.build_method= $2;
-            lex->col_list.empty();
-            lex->change=NullS;
+	| CREATE build_method fulltext INDEX_SYM ident init_key_options ON
+          table_ident
+          {
+            if (add_create_index_prepare(Lex, $8, $2))
+              MYSQL_YYABORT;
           }
           '(' key_list ')' fulltext_key_options
           {
-            LEX *lex=Lex;
-            Key *key;
-            if ($3 != Key::FULLTEXT && lex->key_create_info.parser_name.str)
-            {
-              my_parse_error(ER(ER_SYNTAX_ERROR));
-              MYSQL_YYABORT;
-            }
-            key= new Key($3, $5.str, &lex->key_create_info, 0,
-                         lex->col_list);
-            if (key == NULL)
+            if (add_create_index(Lex, $3, $5.str))
               MYSQL_YYABORT;
-            lex->alter_info.key_list.push_back(key);
-            lex->col_list.empty();
           }
         | CREATE build_method spatial INDEX_SYM ident init_key_options ON
           table_ident
-	  {
-	    LEX *lex=Lex;
-	    lex->sql_command= SQLCOM_CREATE_INDEX;
-	    if (!lex->current_select->add_table_to_list(lex->thd, $8,
-							NULL,
-							TL_OPTION_UPDATING))
-	      MYSQL_YYABORT;
-            lex->alter_info.reset();
-            lex->alter_info.flags= ALTER_ADD_INDEX;
-            lex->alter_info.build_method= $2;
-            lex->col_list.empty();
-            lex->change=NullS;
+          {
+            if (add_create_index_prepare(Lex, $8, $2))
+              MYSQL_YYABORT;
           }
           '(' key_list ')' spatial_key_options
           {
-            LEX *lex=Lex;
-            Key *key;
-            if ($3 != Key::FULLTEXT && lex->key_create_info.parser_name.str)
-            {
-              my_parse_error(ER(ER_SYNTAX_ERROR));
+            if (add_create_index(Lex, $3, $5.str))
               MYSQL_YYABORT;
-            }
-            key= new Key($3, $5.str, &lex->key_create_info, 0,
-                         lex->col_list);
-            if (key == NULL)
-              MYSQL_YYABORT;
-            lex->alter_info.key_list.push_back(key);
-            lex->col_list.empty();
           }
         | CREATE DATABASE opt_if_not_exists ident
           {


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100312134846-tuqhd9w3tv4xgl3d.bundle
Thread
bzr commit into mysql-5.1-telco-6.2 branch (jonas:3086)Jonas Oreland12 Mar