• Andrei Elkin's avatar
    Manual resolving for the following files · 92a09678
    Andrei Elkin authored
    Text conflict in mysql-test/collections/default.experimental
    Text conflict in mysql-test/r/show_check.result
    Text conflict in mysql-test/r/sp-code.result
    Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
    Text conflict in mysql-test/suite/rpl/t/disabled.def
    Text conflict in mysql-test/t/show_check.test
    Text conflict in mysys/my_delete.c
    Text conflict in sql/item.h
    Text conflict in sql/item_cmpfunc.h
    Text conflict in sql/log.cc
    Text conflict in sql/mysqld.cc
    Text conflict in sql/repl_failsafe.cc
    Text conflict in sql/slave.cc
    Text conflict in sql/sql_parse.cc
    Text conflict in sql/sql_table.cc
    Text conflict in sql/sql_yacc.yy
    Text conflict in storage/myisam/ha_myisam.cc
    
    Corrected results for
     stm_auto_increment_bug33029.reject      2009-12-01
    		20:01:49.000000000 +0300
           <andrei> @@ -42,9 +42,6 @@
           <andrei>  RETURN i;
           <andrei>  END//
           <andrei>  CALL p1();
           <andrei> -Warnings:
           <andrei> -Note   1592    Statement may not be safe to log in statement
    		format.
           <andrei> -Note   1592    Statement may not be safe to log in statement
    		format.
    
    There should be indeed no Note present because there is in fact autoincrement 
    top-level query in sp() that triggers inserting in yet another auto-inc table.
    (todo: alert DaoGang to improve the test).
    92a09678
show_check.result 65.9 KB