List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:April 20 2012 2:29pm
Subject:bzr push into mysql-trunk-cluster branch (magnus.blaudd:3479 to 3482) WL#6224
View as plain text  
 3482 magnus.blaudd@stripped	2012-04-20
      WL#6224 Adapt MySQL Cluster to 5.6
       - record new result file which uses OFFLINE and thus prints the
         new deprecation warning

    modified:
      mysql-test/suite/ndb/r/ndb_multi.result
 3481 magnus.blaudd@stripped	2012-04-20
      digest*
       - record new .result files since they change when parser is changed

    modified:
      mysql-test/suite/perfschema/r/digest_table_full.result
      mysql-test/suite/perfschema/r/statement_digest.result
      mysql-test/suite/perfschema/r/statement_digest_consumers.result
      mysql-test/suite/perfschema/r/statement_digest_long_query.result
 3480 magnus.blaudd@stripped	2012-04-20
      WL#3749 MySQL Cluster: On-line DDL, new handler interface
       - Apply patch which converts the "old" [ONLINE|OFFLINE]
         syntax to the new ALGORITHM=COPYING|INPLACE
       - Push warning that ONLINE|OFFLINE is deprecated in this version
         and scheduled to be removed.

    modified:
      sql/lex.h
      sql/sql_yacc.yy
 3479 magnus.blaudd@stripped	2012-04-20
      WL#6224 Adapt MySQL Cluster to 5.6
       - record new .result file for two test cases which
         does SHOW CREATE TABLE on tables with COLUMN_FORMAT and STORAGE
         since those are now marked with !050606 instead of !050120

    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_backup.result
      mysql-test/suite/ndb/r/ndb_column_properties.result
=== modified file 'mysql-test/suite/ndb/r/ndb_multi.result'
--- a/mysql-test/suite/ndb/r/ndb_multi.result	2011-12-19 17:37:12 +0000
+++ b/mysql-test/suite/ndb/r/ndb_multi.result	2012-04-20 14:28:33 +0000
@@ -204,6 +204,8 @@ select count(*) from t1;
 count(*)
 2
 ALTER OFFLINE TABLE t1 ADD COLUMN c int;
+Warnings:
+Warning	1287	'OFFLINE' is deprecated and will be removed in a future release. Please use ALGORITHM=COPY instead
 select a from t1 where b = 2;
 a
 2

=== modified file 'mysql-test/suite/perfschema/r/digest_table_full.result'
--- a/mysql-test/suite/perfschema/r/digest_table_full.result	2012-04-19 11:55:46 +0000
+++ b/mysql-test/suite/perfschema/r/digest_table_full.result	2012-04-20 14:18:29 +0000
@@ -86,7 +86,7 @@ SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, 
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	38	30	1	2
-125e2368c3eaf351aed3ebfee58be90d	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
+4eb22e4b4f8466c09804b463e0fc311e	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
 SHOW VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	2

=== modified file 'mysql-test/suite/perfschema/r/statement_digest.result'
--- a/mysql-test/suite/perfschema/r/statement_digest.result	2012-04-19 11:55:46 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest.result	2012-04-20 14:18:29 +0000
@@ -85,30 +85,30 @@ Warning	1265	Data truncated for column '
 SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-125e2368c3eaf351aed3ebfee58be90d	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
-bc4eed5041e2d6b5ded147735fbe8b1f	SELECT ? FROM t1  	1	0	0	0
-f65353b17370cbfb2baebad10c33fa7e	SELECT ? FROM `t1`  	1	0	0	0
-5d495852490f30472a5e451973f373c1	SELECT ?, ... FROM t1  	2	0	0	0
-b71eb7d7c299dfc30efdd68528f59a76	SELECT ? FROM t2  	1	0	0	0
-ceee8936a87a0f5175734f5f10e7057c	SELECT ?, ... FROM t2  	2	0	0	0
-8706d275b70cc0e0be3278bcfd11425b	INSERT INTO t1 VALUES (?)  	1	1	0	0
-078618f67231c7030acb33e57a83cfd8	INSERT INTO t2 VALUES (?)  	1	1	0	0
-8ad1b5c85b289e58d0f7b427da91a6ce	INSERT INTO t3 VALUES (...)  	4	4	0	0
-d66ea0477cde3db52d29b929fb1d2aca	INSERT INTO t4 VALUES (...)  	1	1	0	0
-dbe42331568bef0faca4a83edb21e87b	INSERT INTO t5 VALUES (...)  	1	1	0	0
-a9ae07204bf4a980fdb9e735c8b5efaa	INSERT INTO t1 VALUES (?) /* , ... */  	2	7	0	0
-15bad11ceed55668da6a92334afc07e9	INSERT INTO t3 VALUES (...) /* , ... */  	1	3	0	0
-56b93d153e0ee2c70de8306ef1fb8d18	INSERT INTO t5 VALUES (...) /* , ... */  	1	3	0	0
-9517ed3fd8d1d4201eae52f4baa4212b	INSERT INTO t1 VALUES ( NULL )  	1	1	0	0
-9c759641f43efd1e0b193d5357cb74b4	INSERT INTO t6 VALUES (...)  	5	5	0	0
-9dc07462e059ac4602d4c14545dc0fe8	SELECT ? + ?  	3	0	0	0
-52d466db2e44df4a904d2800fc3af99e	SELECT ?  	1	0	0	0
+4eb22e4b4f8466c09804b463e0fc311e	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
+34134d104625c823ebdf0896dc1df6ff	SELECT ? FROM t1  	1	0	0	0
+0ea88b0dbdaae318aced9de7f8fb44b0	SELECT ? FROM `t1`  	1	0	0	0
+0facaf94b54342fe31d209c544b9955f	SELECT ?, ... FROM t1  	2	0	0	0
+62232fb4e024b4a72730805b705e638e	SELECT ? FROM t2  	1	0	0	0
+27ac4effd8763c5a4ea9a494496b047f	SELECT ?, ... FROM t2  	2	0	0	0
+0d3049bb7cf7ed23b9944085966d3066	INSERT INTO t1 VALUES (?)  	1	1	0	0
+e7ef0a231d1c6c4df2e89bafe1e024ff	INSERT INTO t2 VALUES (?)  	1	1	0	0
+688b75d0d4f62112e8a0eb13b6c6927e	INSERT INTO t3 VALUES (...)  	4	4	0	0
+fcc26964fb32bb57f85101a12efad382	INSERT INTO t4 VALUES (...)  	1	1	0	0
+e8d37d33eb3e0ff34ff0e8f4bcc39ed2	INSERT INTO t5 VALUES (...)  	1	1	0	0
+ad93034a97072e82e124dafbca16c2c1	INSERT INTO t1 VALUES (?) /* , ... */  	2	7	0	0
+fe9e729df5f1f8e67d7c158d0473b210	INSERT INTO t3 VALUES (...) /* , ... */  	1	3	0	0
+4f643bc0882fb33c6729d5e4d0e2df1e	INSERT INTO t5 VALUES (...) /* , ... */  	1	3	0	0
+04a1558c29fce46cedf6e64170cf0797	INSERT INTO t1 VALUES ( NULL )  	1	1	0	0
+b360eed2967413062a724105b27c60be	INSERT INTO t6 VALUES (...)  	5	5	0	0
+881af9819ee28065ee3d99a1db180ad9	SELECT ? + ?  	3	0	0	0
+6ad52dbeaeeaccd56e293fa8161f9f0d	SELECT ?  	1	0	0	0
 fb40aece1f68b5c3fbaf220bc21ad353	CREATE SCHEMA statements_digest_temp  	2	2	0	0
 622ef9323ed99ee165d79477219a693b	DROP SCHEMA statements_digest_temp  	2	0	0	0
-ce88fbaf7c72c8f2e1efeb16b9cf0f74	SELECT ? FROM t11  	1	0	0	1
-7627748ac774cc7db2d160ea197a1d20	CREATE TABLE t11 ( c CHARACTER (?) )  	2	0	0	1
-13090b5cd13a544b442804d16f8fe1f9	INSERT INTO t11 VALUES (?)  	1	1	1	0
-bc929dc8b518d3e83c072ea8a2aa485c	SHOW WARNINGS  	1	0	0	0
+ffee1eac5955b3ba9a1f9ef2143b8529	SELECT ? FROM t11  	1	0	0	1
+30e5e695a6021fbf00b7ab447d0d1276	CREATE TABLE t11 ( c CHARACTER (?) )  	2	0	0	1
+26662768996dee12e3049121ff1a9bab	INSERT INTO t11 VALUES (?)  	1	1	1	0
+b456fc77d1009cb2e3bb7271b36604b7	SHOW WARNINGS  	1	0	0	0
 ####################################
 # CLEANUP
 ####################################

=== modified file 'mysql-test/suite/perfschema/r/statement_digest_consumers.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2012-04-19 11:55:46 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result	2012-04-20 14:18:29 +0000
@@ -98,30 +98,30 @@ Warning	1265	Data truncated for column '
 ####################################
 SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
 digest	digest_text	count_star
-125e2368c3eaf351aed3ebfee58be90d	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
-bc4eed5041e2d6b5ded147735fbe8b1f	SELECT ? FROM t1  	1
-f65353b17370cbfb2baebad10c33fa7e	SELECT ? FROM `t1`  	1
-5d495852490f30472a5e451973f373c1	SELECT ?, ... FROM t1  	2
-b71eb7d7c299dfc30efdd68528f59a76	SELECT ? FROM t2  	1
-ceee8936a87a0f5175734f5f10e7057c	SELECT ?, ... FROM t2  	2
-8706d275b70cc0e0be3278bcfd11425b	INSERT INTO t1 VALUES (?)  	1
-078618f67231c7030acb33e57a83cfd8	INSERT INTO t2 VALUES (?)  	1
-8ad1b5c85b289e58d0f7b427da91a6ce	INSERT INTO t3 VALUES (...)  	4
-d66ea0477cde3db52d29b929fb1d2aca	INSERT INTO t4 VALUES (...)  	1
-dbe42331568bef0faca4a83edb21e87b	INSERT INTO t5 VALUES (...)  	1
-a9ae07204bf4a980fdb9e735c8b5efaa	INSERT INTO t1 VALUES (?) /* , ... */  	2
-15bad11ceed55668da6a92334afc07e9	INSERT INTO t3 VALUES (...) /* , ... */  	1
-56b93d153e0ee2c70de8306ef1fb8d18	INSERT INTO t5 VALUES (...) /* , ... */  	1
-9517ed3fd8d1d4201eae52f4baa4212b	INSERT INTO t1 VALUES ( NULL )  	1
-9c759641f43efd1e0b193d5357cb74b4	INSERT INTO t6 VALUES (...)  	5
-9dc07462e059ac4602d4c14545dc0fe8	SELECT ? + ?  	3
-52d466db2e44df4a904d2800fc3af99e	SELECT ?  	1
+4eb22e4b4f8466c09804b463e0fc311e	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
+34134d104625c823ebdf0896dc1df6ff	SELECT ? FROM t1  	1
+0ea88b0dbdaae318aced9de7f8fb44b0	SELECT ? FROM `t1`  	1
+0facaf94b54342fe31d209c544b9955f	SELECT ?, ... FROM t1  	2
+62232fb4e024b4a72730805b705e638e	SELECT ? FROM t2  	1
+27ac4effd8763c5a4ea9a494496b047f	SELECT ?, ... FROM t2  	2
+0d3049bb7cf7ed23b9944085966d3066	INSERT INTO t1 VALUES (?)  	1
+e7ef0a231d1c6c4df2e89bafe1e024ff	INSERT INTO t2 VALUES (?)  	1
+688b75d0d4f62112e8a0eb13b6c6927e	INSERT INTO t3 VALUES (...)  	4
+fcc26964fb32bb57f85101a12efad382	INSERT INTO t4 VALUES (...)  	1
+e8d37d33eb3e0ff34ff0e8f4bcc39ed2	INSERT INTO t5 VALUES (...)  	1
+ad93034a97072e82e124dafbca16c2c1	INSERT INTO t1 VALUES (?) /* , ... */  	2
+fe9e729df5f1f8e67d7c158d0473b210	INSERT INTO t3 VALUES (...) /* , ... */  	1
+4f643bc0882fb33c6729d5e4d0e2df1e	INSERT INTO t5 VALUES (...) /* , ... */  	1
+04a1558c29fce46cedf6e64170cf0797	INSERT INTO t1 VALUES ( NULL )  	1
+b360eed2967413062a724105b27c60be	INSERT INTO t6 VALUES (...)  	5
+881af9819ee28065ee3d99a1db180ad9	SELECT ? + ?  	3
+6ad52dbeaeeaccd56e293fa8161f9f0d	SELECT ?  	1
 fb40aece1f68b5c3fbaf220bc21ad353	CREATE SCHEMA statements_digest_temp  	2
 622ef9323ed99ee165d79477219a693b	DROP SCHEMA statements_digest_temp  	2
-ce88fbaf7c72c8f2e1efeb16b9cf0f74	SELECT ? FROM t11  	1
-7627748ac774cc7db2d160ea197a1d20	CREATE TABLE t11 ( c CHARACTER (?) )  	2
-13090b5cd13a544b442804d16f8fe1f9	INSERT INTO t11 VALUES (?)  	1
-bc929dc8b518d3e83c072ea8a2aa485c	SHOW WARNINGS  	1
+ffee1eac5955b3ba9a1f9ef2143b8529	SELECT ? FROM t11  	1
+30e5e695a6021fbf00b7ab447d0d1276	CREATE TABLE t11 ( c CHARACTER (?) )  	2
+26662768996dee12e3049121ff1a9bab	INSERT INTO t11 VALUES (?)  	1
+b456fc77d1009cb2e3bb7271b36604b7	SHOW WARNINGS  	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
 digest	digest_text
 ####################################

=== modified file 'mysql-test/suite/perfschema/r/statement_digest_long_query.result'
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2012-04-19 11:55:46 +0000
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result	2012-04-20 14:18:29 +0000
@@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
 digest	digest_text	count_star
-154c5a0a85343c653c1192dd31be1dd3	TRUNCATE TABLE events_statements_summary_by_digest  	1
-62e6f6c43d705d93aef962fdc8ccd803	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + !
 ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
+9e013d9a7835aaafa53a49a148f01d00	TRUNCATE TABLE events_statements_summary_by_digest  	1
+620c7f5d8793f1fa5e15585e6bc0d3e8	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + !
 ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1

=== modified file 'sql/lex.h'
--- a/sql/lex.h	2012-04-19 11:55:46 +0000
+++ b/sql/lex.h	2012-04-20 14:09:44 +0000
@@ -398,9 +398,15 @@ static SYMBOL symbols[] = {
   { "NUMERIC",		SYM(NUMERIC_SYM)},
   { "NVARCHAR",		SYM(NVARCHAR_SYM)},
   { "OFFSET",		SYM(OFFSET_SYM)},
+#ifndef MCP_WL3749
+  { "OFFLINE",          SYM(OFFLINE_SYM)},
+#endif
   { "OLD_PASSWORD",	SYM(OLD_PASSWORD)},
   { "ON",		SYM(ON)},
   { "ONE",              SYM(ONE_SYM)},
+#ifndef MCP_WL3749
+  { "ONLINE",           SYM(ONLINE_SYM)},
+#endif
   { "ONLY",             SYM(ONLY_SYM)},
   { "OPEN",		SYM(OPEN_SYM)},
   { "OPTIMIZE",		SYM(OPTIMIZE)},

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-04-19 11:55:46 +0000
+++ b/sql/sql_yacc.yy	2012-04-20 14:09:44 +0000
@@ -986,6 +986,9 @@ static bool sp_create_assignment_instr(T
   Condition_information_item *cond_info_item;
   Condition_information_item::Name cond_info_item_name;
   List<Condition_information_item> *cond_info_list;
+  /* #ifndef MCP_WL3749 */
+  Alter_info::enum_alter_table_algorithm online_offline;
+  /* #endif */
 }
 
 %{
@@ -1374,10 +1377,16 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  NUMBER_SYM                    /* SQL-2003-N */
 %token  NUMERIC_SYM                   /* SQL-2003-R */
 %token  NVARCHAR_SYM
+/* #ifndef MCP_WL3749  */
+%token  OFFLINE_SYM
+/* #endif */
 %token  OFFSET_SYM
 %token  OLD_PASSWORD
 %token  ON                            /* SQL-2003-R */
 %token  ONE_SYM
+/* #ifndef MCP_WL3749  */
+%token  ONLINE_SYM
+/* #endif */
 %token  ONLY_SYM                      /* SQL-2003-R */
 %token  OPEN_SYM                      /* SQL-2003-R */
 %token  OPTIMIZE
@@ -1798,6 +1807,10 @@ bool my_yyoverflow(short **a, YYSTYPE **
 
 %type <boolfunc2creator> comp_op
 
+/* #ifndef MCP_WL3749 */
+%type <online_offline> opt_online_offline
+/* #endif */
+
 %type <NONE>
         query verb_clause create change select do drop insert replace insert2
         insert_values update delete truncate rename
@@ -2374,36 +2387,78 @@ create:
             }
             create_table_set_open_action_and_adjust_tables(lex);
           }
+/* #ifndef MCP_WL3749 */
+        | CREATE opt_online_offline opt_unique INDEX_SYM ident key_alg ON table_ident
+/* #else
         | CREATE opt_unique INDEX_SYM ident key_alg ON table_ident
+   #endif */
           {
+/* #ifndef MCP_WL3749 */
+            if (add_create_index_prepare(Lex, $8))
+              MYSQL_YYABORT;
+            Lex->alter_info.requested_algorithm= $2;
+/* #else
             if (add_create_index_prepare(Lex, $7))
               MYSQL_YYABORT;
+   #endif */
           }
           '(' key_list ')' normal_key_options
           {
+/* #ifndef MCP_WL3749 */
+            if (add_create_index(Lex, $3, $5))
+/* #else
             if (add_create_index(Lex, $2, $4))
+   #endif */
               MYSQL_YYABORT;
           }
+/* #ifndef MCP_WL3749 */
+        | CREATE opt_online_offline fulltext INDEX_SYM ident init_key_options ON
+/* #else
         | CREATE fulltext INDEX_SYM ident init_key_options ON
+   #endif */
           table_ident
           {
+/* #ifndef MCP_WL3749 */
+            if (add_create_index_prepare(Lex, $8))
+              MYSQL_YYABORT;
+            Lex->alter_info.requested_algorithm= $2;
+/* #else
             if (add_create_index_prepare(Lex, $7))
               MYSQL_YYABORT;
+   #endif */
           }
           '(' key_list ')' fulltext_key_options
           {
+/* #ifndef MCP_WL3749 */
+            if (add_create_index(Lex, $3, $5))
+/* #else
             if (add_create_index(Lex, $2, $4))
+   #endif */
               MYSQL_YYABORT;
           }
+/* #ifndef MCP_WL3749 */
+        | CREATE opt_online_offline spatial INDEX_SYM ident init_key_options ON
+/* #else
         | CREATE spatial INDEX_SYM ident init_key_options ON
+   #endif */
           table_ident
           {
+/* #ifndef MCP_WL3749 */
+            if (add_create_index_prepare(Lex, $8))
+              MYSQL_YYABORT;
+            Lex->alter_info.requested_algorithm= $2;
+/* #else
             if (add_create_index_prepare(Lex, $7))
               MYSQL_YYABORT;
+   #endif */
           }
           '(' key_list ')' spatial_key_options
           {
+/* #ifndef MCP_WL3749 */
+            if (add_create_index(Lex, $3, $5))
+/* #else
             if (add_create_index(Lex, $2, $4))
+   #endif */
               MYSQL_YYABORT;
           }
         | CREATE DATABASE opt_if_not_exists ident
@@ -6831,7 +6886,11 @@ string_list:
 */
 
 alter:
+/* #ifndef MCP_WL3749 */
+          ALTER opt_online_offline opt_ignore TABLE_SYM table_ident
+/* #else
           ALTER opt_ignore TABLE_SYM table_ident
+   #endif */
           {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -6839,7 +6898,11 @@ alter:
             lex->name.length= 0;
             lex->sql_command= SQLCOM_ALTER_TABLE;
             lex->duplicates= DUP_ERROR; 
+/* #ifndef MCP_WL3749 */
+            if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
+/* #else
             if (!lex->select_lex.add_table_to_list(thd, $4, NULL,
+   #endif */
                                                    TL_OPTION_UPDATING,
                                                    TL_READ_NO_INSERT,
                                                    MDL_SHARED_UPGRADABLE))
@@ -6852,6 +6915,9 @@ alter:
             lex->create_info.default_table_charset= NULL;
             lex->create_info.row_type= ROW_TYPE_NOT_USED;
             lex->alter_info.reset();
+#ifndef MCP_WL3749
+            lex->alter_info.requested_algorithm= $2;
+#endif
             lex->no_write_to_binlog= 0;
             lex->create_info.storage_media= HA_SM_DEFAULT;
             lex->create_last_non_select_table= lex->last_table();
@@ -7196,6 +7262,31 @@ alter_commands:
           }
         ;
 
+/* #ifndef MCP_WL3749 */
+opt_online_offline:
+        /* empty */
+          {
+            $$= Alter_info::ALTER_TABLE_ALGORITHM_DEFAULT;
+          }
+        | ONLINE_SYM
+          {
+            push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
+                                ER_WARN_DEPRECATED_SYNTAX,
+                                ER(ER_WARN_DEPRECATED_SYNTAX),
+                                "ONLINE", "ALGORITHM=INPLACE");
+            $$= Alter_info::ALTER_TABLE_ALGORITHM_INPLACE;
+          }
+        | OFFLINE_SYM
+          {
+            push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
+                                ER_WARN_DEPRECATED_SYNTAX,
+                                ER(ER_WARN_DEPRECATED_SYNTAX),
+                                "OFFLINE", "ALGORITHM=COPY");
+            $$= Alter_info::ALTER_TABLE_ALGORITHM_COPY;
+          }
+        ;
+/* #endif */
+
 remove_partitioning:
           REMOVE_SYM PARTITIONING_SYM have_partitioning
           {
@@ -11170,17 +11261,30 @@ drop:
           }
           table_list opt_restrict
           {}
+/* #ifndef MCP_WL3749 */
+        | DROP opt_online_offline INDEX_SYM ident ON table_ident {}
+/* #else
         | DROP INDEX_SYM ident ON table_ident {}
+   #endif */
           {
             LEX *lex=Lex;
+/* #ifndef MCP_WL3749 */
+            Alter_drop *ad= new Alter_drop(Alter_drop::KEY, $4.str);
+/* #else
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, $3.str);
+   #endif */
             if (ad == NULL)
               MYSQL_YYABORT;
             lex->sql_command= SQLCOM_DROP_INDEX;
             lex->alter_info.reset();
             lex->alter_info.flags= Alter_info::ALTER_DROP_INDEX;
             lex->alter_info.drop_list.push_back(ad);
+/* #ifndef MCP_WL3749 */
+            lex->alter_info.requested_algorithm= $2;
+            if (!lex->current_select->add_table_to_list(lex->thd, $6, NULL,
+/* #else
             if (!lex->current_select->add_table_to_list(lex->thd, $5, NULL,
+   #endif */
                                                         TL_OPTION_UPDATING,
                                                         TL_READ_NO_INSERT,
                                                         MDL_SHARED_UPGRADABLE))

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (magnus.blaudd:3479 to 3482) WL#6224magnus.blaudd23 Apr