diff options
author | unknown <monty@narttu.mysql.fi> | 2003-10-08 18:53:31 +0300 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-10-08 18:53:31 +0300 |
commit | 32747b19de5c6a4a78ecf65378c8268823a3b4ca (patch) | |
tree | 91c3c750d9a03c42d9da0b2335928ae4a162e4ea /mysql-test/r/insert_select.result | |
parent | 69ea87fe312be473401dc3fb1c6756a72b86881a (diff) | |
download | mariadb-git-32747b19de5c6a4a78ecf65378c8268823a3b4ca.tar.gz |
Fixed bug in error handling of CREATE ... SELECT
More tests cases
After merge fixes
BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
Delete: mysql-test/t/ansi-master.opt
mysql-test/r/ansi.result:
Cleaned up test to be able to remove ansi-master.opt
mysql-test/r/create.result:
Updated results
mysql-test/r/insert_select.result:
Updated results
mysql-test/r/rpl000009.result:
Updated results
mysql-test/t/ansi.test:
Cleaned up test to be able to remove ansi-master.opt
mysql-test/t/create.test:
More tests
mysql-test/t/insert_select.test:
More tests
mysql-test/t/mysqlbinlog.test:
Fixed test after merge
sql/mysql_priv.h:
Added character-sets-dir to 'show variables'
sql/set_var.cc:
Added character-sets-dir to 'show variables'
sql/sql_class.cc:
Fixed that send_error() is called properly when a SELECT fails
sql/sql_class.h:
Fixed that send_error() is called properly when a SELECT fails
sql/sql_insert.cc:
Fixed bug in error handling of CREATE ... SELECT
sql/sql_select.cc:
Fixed bug in error handling of CREATE ... SELECT
Diffstat (limited to 'mysql-test/r/insert_select.result')
-rw-r--r-- | mysql-test/r/insert_select.result | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 7b8e3c46200..8eecccf6fec 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -74,7 +74,12 @@ insert into t1 select * from t2; ERROR 23000: Duplicate entry '2' for key 1 show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 master-bin.000001 79 Query 1 79 use `test`; insert into t1 select * from t2 +select * from t1; +a +1 +2 drop table t1, t2; create table t1 (a int not null); create table t2 (a int not null); |