mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
0eda48463c
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).
|
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| CMakeLists.txt | ||
| comp_sql.c | ||
| dheadgen.pl | ||
| fill_help_tables.sql | ||
| make_binary_distribution.sh | ||
| make_sharedlib_distribution.sh | ||
| make_win_bin_dist | ||
| Makefile.am | ||
| msql2mysql.sh | ||
| mysql_config.pl.in | ||
| mysql_config.sh | ||
| mysql_convert_table_format.sh | ||
| mysql_find_rows.sh | ||
| mysql_fix_extensions.sh | ||
| mysql_fix_privilege_tables.sh | ||
| mysql_install_db.pl.in | ||
| mysql_install_db.sh | ||
| mysql_secure_installation.pl.in | ||
| mysql_secure_installation.sh | ||
| mysql_setpermission.sh | ||
| mysql_system_tables.sql | ||
| mysql_system_tables_data.sql | ||
| mysql_system_tables_fix.sql | ||
| mysql_test_data_timezone.sql | ||
| mysql_zap.sh | ||
| mysqlaccess.conf | ||
| mysqlaccess.sh | ||
| mysqlbug.sh | ||
| mysqld_multi.sh | ||
| mysqld_safe.sh | ||
| mysqldumpslow.sh | ||
| mysqlhotcopy.sh | ||