mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
e8e85ed2a6
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).
|
||
|---|---|---|
| .. | ||
| binlog_auto_increment_bug33029.result | ||
| binlog_base64_flag.result | ||
| binlog_database.result | ||
| binlog_delete_and_flush_index.result | ||
| binlog_grant.result | ||
| binlog_implicit_commit.result | ||
| binlog_incident.result | ||
| binlog_index.result | ||
| binlog_innodb.result | ||
| binlog_innodb_row.result | ||
| binlog_killed.result | ||
| binlog_killed_simulate.result | ||
| binlog_max_extension.result | ||
| binlog_mix_innodb_stat.result | ||
| binlog_mixed_failure_mixing_engines.result | ||
| binlog_multi_engine.result | ||
| binlog_old_versions.result | ||
| binlog_row_binlog.result | ||
| binlog_row_ctype_cp932.result | ||
| binlog_row_ctype_ucs.result | ||
| binlog_row_drop_tmp_tbl.result | ||
| binlog_row_failure_mixing_engines.result | ||
| binlog_row_innodb_stat.result | ||
| binlog_row_insert_select.result | ||
| binlog_row_mix_innodb_myisam.result | ||
| binlog_row_mysqlbinlog_db_filter.result | ||
| binlog_row_mysqlbinlog_verbose.result | ||
| binlog_sql_mode.result | ||
| binlog_start_comment.result | ||
| binlog_statement_insert_delayed.result | ||
| binlog_stm_binlog.result | ||
| binlog_stm_blackhole.result | ||
| binlog_stm_ctype_cp932.result | ||
| binlog_stm_ctype_ucs.result | ||
| binlog_stm_do_db.result | ||
| binlog_stm_drop_tmp_tbl.result | ||
| binlog_stm_innodb_stat.result | ||
| binlog_stm_insert_select.result | ||
| binlog_stm_mix_innodb_myisam.result | ||
| binlog_stm_ps.result | ||
| binlog_stm_row.result | ||
| binlog_stm_unsafe_warning.result | ||
| binlog_tbl_metadata.result | ||
| binlog_tmp_table.result | ||
| binlog_truncate_innodb.result | ||
| binlog_truncate_myisam.result | ||
| binlog_unsafe.result | ||