mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +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).
30 lines
600 B
Text
30 lines
600 B
Text
create table foo (a int);
|
|
flush logs;
|
|
create temporary table tmp1_foo like foo;
|
|
create temporary table tmp2_foo (a int);
|
|
insert into tmp1_foo values (1), (2), (3), (4);
|
|
replace into tmp2_foo values (1), (2), (3), (4);
|
|
update tmp1_foo set a=2*a-1;
|
|
update tmp2_foo set a=2*a;
|
|
delete from tmp1_foo where a < 5;
|
|
delete from tmp2_foo where a < 5;
|
|
insert into foo select * from tmp1_foo;
|
|
insert into foo select * from tmp2_foo;
|
|
truncate table tmp1_foo;
|
|
truncate table tmp2_foo;
|
|
flush logs;
|
|
select * from foo;
|
|
a
|
|
5
|
|
7
|
|
6
|
|
8
|
|
drop table foo;
|
|
create table foo (a int);
|
|
select * from foo;
|
|
a
|
|
5
|
|
7
|
|
6
|
|
8
|
|
drop table foo;
|