summaryrefslogtreecommitdiff
path: root/mysql-test/t/delete.test
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-03-17 15:05:04 +0200
committerunknown <monty@narttu.mysql.fi>2003-03-17 15:05:04 +0200
commitb0b315dce3d961e5b29830dfafdff6bc4e58aaa0 (patch)
tree7762c42e75102f122a8c9f5423ed0b676d5430a4 /mysql-test/t/delete.test
parenta821703912e84b6be1f0a686f27e1c81a0040ff8 (diff)
downloadmariadb-git-b0b315dce3d961e5b29830dfafdff6bc4e58aaa0.tar.gz
After merge fixes
Don't create temporary objects with no table name myisam/mi_open.c: After merge fix mysql-test/r/analyse.result: After merge fix mysql-test/r/backup.result: After merge fix mysql-test/r/create.result: After merge fix mysql-test/r/delete.result: After merge fix mysql-test/r/func_like.result: After merge fix mysql-test/r/innodb.result: After merge fix mysql-test/r/rpl_loaddatalocal.result: After merge fix mysql-test/r/type_timestamp.result: After merge fix mysql-test/t/delete.test: Change to not use table 't' sql/sql_class.h: Remove usage of thd when creating 'Table_ident' Don't create temporary objects with no table name sql/sql_derived.cc: Indentation fix sql/sql_select.cc: After merge fix Fixed wrong return -> DBUG_RETURN() sql/sql_yacc.yy: Remove usage of thd when creating 'Table_ident'
Diffstat (limited to 'mysql-test/t/delete.test')
-rw-r--r--mysql-test/t/delete.test8
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test
index af047db04bd..91216ff9c3a 100644
--- a/mysql-test/t/delete.test
+++ b/mysql-test/t/delete.test
@@ -38,14 +38,14 @@ insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(2
delete from t1 where a=27;
drop table t1;
-CREATE TABLE `t` (
+CREATE TABLE `t1` (
`i` int(10) NOT NULL default '0',
`i2` int(10) NOT NULL default '0',
PRIMARY KEY (`i`)
-) TYPE=MyISAM CHARSET=latin1;
+);
-- error 1054
-DELETE FROM t USING t WHERE post='1';
-drop table if exists t;
+DELETE FROM t1 USING t1 WHERE post='1';
+drop table t1;
#
# CHAR(0) bug - not actually DELETE bug, but anyway...