summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2004-10-22 18:44:51 +0300
committerunknown <monty@mysql.com>2004-10-22 18:44:51 +0300
commitbc6652db9b1f5f302648c3a920fb1fa25449a6d8 (patch)
tree6faefd7a2f197f4031ef94eb74fc71f8f2936185 /mysql-test
parentcfcca61a177eecacdc2c525c1ba4fea082b1b1c4 (diff)
downloadmariadb-git-bc6652db9b1f5f302648c3a920fb1fa25449a6d8.tar.gz
Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094) client/mysql.cc: Fix compiler warnings client/mysqltest.c: Fix wrong counting of lines Remove compiler warnings heap/hp_hash.c: Fix compiler warnings innobase/dict/dict0load.c: Fix compiler warnings innobase/include/mem0mem.h: Fix compiler warnings libmysql/client_settings.h: Fix compiler warnings myisam/ft_nlq_search.c: Add comments about compiler warnings myisam/rt_index.c: Add comments about compiler warnings myisam/rt_mbr.c: Add comments about compiler warnings mysql-test/r/ps.result: Test case for bug#6094 mysql-test/t/ps.test: Test case for bug#6094 mysys/hash.c: Fix compiler warnings mysys/my_handler.c: Add comments about compiler warnings mysys/my_thr_init.c: Add comments about compiler warnings ndb/include/mgmapi/mgmapi.h: Fix compiler warnings regex/main.c: Fix compiler warnings sql/item.h: Fix compiler warnings sql/item_func.h: Add comments about compiler warnings sql/spatial.h: Add comments about compiler warnings sql/sql_lex.h: Fix compiler warning sql/sql_list.h: Fix compiler warning sql/sql_parse.cc: Move testing of access rights of tables in CREATE ... SELECT to create_table_precheck() to fix privilege checking in CREATE ... SELECT (Bug #6094) sql/sql_prepare.cc: Remove not needed empty line sql/sql_string.h: Fix compiler warnings strings/ctype-mb.c: Fix compiler warnings
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/ps.result14
-rw-r--r--mysql-test/t/ps.test18
2 files changed, 32 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 0950a066e64..a416ba5c482 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -410,3 +410,17 @@ a a
1.1 1.2
2.1 2.2
deallocate prepare stmt;
+create table t1 (a int);
+insert into t1 values (1),(2),(3);
+create table t2 select * from t1;
+PREPARE my_stmt FROM 'create table t2 select * from t1';
+drop table t2;
+execute my_stmt;
+drop table t2;
+execute my_stmt;
+execute my_stmt;
+ERROR 42S01: Table 't2' already exists
+drop table t2;
+execute my_stmt;
+drop table t1,t2;
+deallocate prepare my_stmt;
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 04ab8aa62a8..9546a698e58 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -415,3 +415,21 @@ execute stmt;
execute stmt;
execute stmt;
deallocate prepare stmt;
+
+#
+# Test CREATE TABLE ... SELECT (Bug #6094)
+#
+create table t1 (a int);
+insert into t1 values (1),(2),(3);
+create table t2 select * from t1;
+PREPARE my_stmt FROM 'create table t2 select * from t1';
+drop table t2;
+execute my_stmt;
+drop table t2;
+execute my_stmt;
+--error 1050
+execute my_stmt;
+drop table t2;
+execute my_stmt;
+drop table t1,t2;
+deallocate prepare my_stmt;