Andrei Elkin 0eda48463c Manual resolving for the following files ... 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).		2009-12-01 21:07:18 +02:00
..
charsets	merged 5.0-bugteam to 5.1-bugteam	2008-05-28 17:18:24 +03:00
.cvsignore
errmsg-cnv.sh	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00
errmsg-utf8.txt	Merge	2009-11-03 12:37:02 +01:00
errmsg.txt	Manual resolving for the following files	2009-12-01 21:07:18 +02:00
Makefile.am	WL#751 Error message construction, backport	2009-10-15 17:23:43 +05:00