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

1 files changed, 33 insertions, 20 deletions

diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result
index fc55de7246c..1f78a505280 100644
--- a/mysql-test/r/rpl000009.result
+++ b/mysql-test/r/rpl000009.result
@@ -4,9 +4,13 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+drop database if exists mysqltest;
 drop database if exists mysqltest2;
-create database mysqltest2;
+drop database if exists mysqltest3;
 drop database if exists mysqltest;
+drop database if exists mysqltest2;
+drop database if exists mysqltest3;
+create database mysqltest2;
 create database mysqltest;
 create database mysqltest2;
 create table mysqltest2.foo (n int);
@@ -46,45 +50,43 @@ show databases;
 Database
 mysql
 test
-create database foo;
-create table foo.t1(n int, s char(20));
-insert into foo.t1 values (1, 'original foo.t1');
-create table foo.t3(n int, s char(20));
-insert into foo.t3 values (1, 'original foo.t3');
-create database foo2;
-create table foo2.t1(n int, s char(20));
-insert into foo2.t1 values (1, 'original foo2.t1');
-create database bar;
-create table bar.t1(n int, s char(20));
-insert into bar.t1 values (1, 'original bar.t1');
-create table bar.t3(n int, s char(20));
-insert into bar.t3 values (1, 'original bar.t3');
+create database mysqltest2;
+create table mysqltest2.t1(n int, s char(20));
+insert into mysqltest2.t1 values (1, 'original foo.t1');
+create table mysqltest2.t3(n int, s char(20));
+insert into mysqltest2.t3 values (1, 'original foo.t3');
+create database mysqltest3;
+create table mysqltest3.t1(n int, s char(20));
+insert into mysqltest3.t1 values (1, 'original foo2.t1');
+create database mysqltest;
+create table mysqltest.t1(n int, s char(20));
+insert into mysqltest.t1 values (1, 'original bar.t1');
+create table mysqltest.t3(n int, s char(20));
+insert into mysqltest.t3 values (1, 'original bar.t3');
 load data from master;
-Warnings:
-Note	1008	Can't drop database 'mysqltest'; database doesn't exist
-Note	1008	Can't drop database 'mysqltest2'; database doesn't exist
 show databases;
 Database
 mysql
 mysqltest
 mysqltest2
+mysqltest3
 test
 use mysqltest2;
 show tables;
 Tables_in_mysqltest2
-use mysqltest;
 t1
 t3
 select * from t1;
 n	s
 1	original foo.t1
-use foo2;
+use mysqltest3;
 show tables;
-Tables_in_foo2
+Tables_in_mysqltest3
 t1
 select * from t1;
 n	s
 1	original foo2.t1
+use mysqltest;
 show tables;
 Tables_in_mysqltest
 t1
@@ -100,6 +102,9 @@ n	s
 11	eleven test
 12	twelve test
 13	thirteen test
+select * from mysqltest.t3;
+n	s
+1	original bar.t3
 insert into mysqltest.t1 values (4, 'four test');
 select * from mysqltest.t1;
 n	s
@@ -107,5 +112,13 @@ n	s
 2	two test
 3	three test
 4	four test
+load table mysqltest.t1 from master;
+ERROR 42S01: Table 't1' already exists
+drop table mysqltest.t1;
+load table mysqltest.t1 from master;
+load table bar.t1 from master;
+ERROR HY000: Error from master: 'Table 'bar.t1' doesn't exist'
 drop database mysqltest;
 drop database mysqltest2;
+drop database mysqltest2;
+drop database mysqltest3;