List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:March 6 2012 1:05pm
Subject:bzr push into mysql-trunk branch (jon.hauglid:3720 to 3721) WL#5968
View as plain text  
 3721 Jon Olav Hauglid	2012-03-06
      WL#5968: Implement START TRANSACTION READ (WRITE|ONLY)
      
      Follow-up: Fix warning in sql_yacc.yy.

    modified:
      sql/sql_yacc.yy
 3720 Tor Didriksen	2012-03-06 [merge]
      Merge 5.5 => trunk

    modified:
      mysys/stacktrace.c
      sql/mysqld.cc
      sql/signal_handler.cc
      storage/innobase/include/sync0rw.ic
      storage/myisam/mi_dynrec.c
=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2012-03-01 13:53:55 +0000
+++ b/sql/sql_yacc.yy	2012-03-06 13:05:22 +0000
@@ -13551,6 +13551,7 @@ set:
             sp_create_assignment_lex(YYTHD, yychar == YYEMPTY);
           }
           start_option_value_list
+          {}
         ;
 
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jon.hauglid:3720 to 3721) WL#5968Jon Olav Hauglid6 Mar