bzr push into mysql-trunk branch (jon.hauglid:4020 to 4021) Bug#14031353

[Jon Olav Hauglid]

 4021 Jon Olav Hauglid	2012-06-19
      Bug#14031353 LOCK/ALGORITHM CLAUSES MISSING FROM CREATE/DROP 
                   INDEX STATEMENTS
      
      Follow-up patch.
      
      Renamed parser rule lock_option to alter_lock_option
      to avoid name conflict with existing lock_option rule.
      (Also renamed algorithm_option for consistency)

    modified:
      sql/sql_yacc.yy
 4020 Alexander Barkov	2012-06-19
      Bug#13833019
      Bug#13832749
      Adding files forgotten in the previous push.

    added:
      mysql-test/include/gis_debug.inc
      mysql-test/r/gis-debug.result
      mysql-test/t/gis-debug.test
=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-06-12 11:10:27 +0000
+++ b/sql/sql_yacc.yy	2012-06-19 12:20:30 +0000
@@ -7891,18 +7891,18 @@ alter_list_item:
             LEX *lex=Lex;
             lex->alter_info.flags|= Alter_info::ALTER_ORDER;
           }
-        | algorithm_option
-        | lock_option
+        | alter_algorithm_option
+        | alter_lock_option
         ;
 
 opt_index_lock_algorithm:
           /* empty */
-        | lock_option
-        | algorithm_option
-        | lock_option algorithm_option
-        | algorithm_option lock_option
+        | alter_lock_option
+        | alter_algorithm_option
+        | alter_lock_option alter_algorithm_option
+        | alter_algorithm_option alter_lock_option
 
-algorithm_option:
+alter_algorithm_option:
           ALGORITHM_SYM opt_equal DEFAULT
           {
             Lex->alter_info.requested_algorithm=
@@ -7918,7 +7918,7 @@ algorithm_option:
           }
         ;
 
-lock_option:
+alter_lock_option:
           LOCK_SYM opt_equal DEFAULT
           {
             Lex->alter_info.requested_lock=

No bundle (reason: useless for push emails).