summaryrefslogtreecommitdiff
path: root/mysql-test/t/insert.test
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-10-08 12:01:58 +0300
committerunknown <monty@narttu.mysql.fi>2003-10-08 12:01:58 +0300
commita8d0df3ac791f44d0d23934fd508871a1f11c3da (patch)
tree5f3cf2f56cc441edc81b2cf5fc056128ab764b41 /mysql-test/t/insert.test
parent9357319dcd40d098adc1c1965f41b02af0e22b8c (diff)
downloadmariadb-git-a8d0df3ac791f44d0d23934fd508871a1f11c3da.tar.gz
Fixes after merge
mysql-test/std_data/trunc_binlog.000001: Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001 client/mysqltest.c: Fixed merge problem mysql-test/mysql-test-run.sh: Fixed merge problem mysql-test/r/distinct.result: Fix after merge mysql-test/r/drop_temp_table.result: Fix after merge mysql-test/r/join_outer.result: Fix after merge mysql-test/r/mysqldump.result: Fix after merge mysql-test/r/null_key.result: Fix after merge mysql-test/r/order_by.result: Fix after merge mysql-test/r/rpl_alter.result: Fix after merge mysql-test/r/rpl_loaddata.result: Fix after merge mysql-test/r/rpl_loaddata_rule_m.result: Fix after merge mysql-test/r/rpl_trunc_binlog.result: Fix after merge mysql-test/r/select_safe.result: Fix after merge mysql-test/t/insert.test: Fix after merge mysql-test/t/mysqlbinlog.test: Fix after merge mysql-test/t/rpl000009.test: Fix after merge mysql-test/t/rpl_alter.test: Fix after merge mysql-test/t/rpl_loaddata_rule_m.test: Fix after merge mysql-test/t/rpl_trunc_binlog.test: Fix after merge sql-common/client.c: Fix after merge sql/item_subselect.cc: Fix after merge sql/repl_failsafe.cc: Fix after merge sql/slave.cc: Fix after merge sql/sql_insert.cc: Fix after merge
Diffstat (limited to 'mysql-test/t/insert.test')
-rw-r--r--mysql-test/t/insert.test10
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test
index ae0a87895e1..62d277bfad5 100644
--- a/mysql-test/t/insert.test
+++ b/mysql-test/t/insert.test
@@ -80,10 +80,10 @@ drop table t1,t2;
#
--disable_warnings
-drop database if exists test_$1;
+drop database if exists mysqltest;
--enable_warnings
-create database test_$1;
-use test_$1;
+create database mysqltest;
+use mysqltest;
create table t1 (c int);
-insert into test_$1.t1 set test_$1.t1.c = '1';
-drop database test_$1;
+insert into mysqltest.t1 set mysqltest.t1.c = '1';
+drop database mysqltest;