summaryrefslogtreecommitdiff
path: root/sql-bench
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-28 21:35:50 +0200
committerunknown <monty@donna.mysql.com>2001-01-28 21:35:50 +0200
commitd4e087e0cee0c5c3d12fbbedbd14735f308184ac (patch)
treefabb5447e17b9f0959cb83b6d88351367ca53645 /sql-bench
parent40f208225f1dde6678fe6f479949eab0d449ee62 (diff)
downloadmariadb-git-d4e087e0cee0c5c3d12fbbedbd14735f308184ac.tar.gz
Fixed ALTER TABLE on MERGE tables
Fixed bug in DISTINCT Docs/manual.texi: Updated Changelog Cleaned up adding character sets merge/open.c: skip comments myisam/mi_check.c: Fixed bug when sorting index on Windows myisammrg/myrg_info.c: Use only portable printf arguments myisammrg/myrg_rrnd.c: Use only portable printf arguments mysql-test/r/distinct.result: Added test case for bug in distinct mysql-test/r/merge.result: Added test for ALTER TABLE mysql-test/t/distinct.test: Added test case for bug in distinct mysql-test/t/merge.test: Added test for ALTER TABLE sql-bench/crash-me.sh: Fixed portability issues sql/ha_myisammrg.cc: Fixed for ALTER TABLE on MERGE tables sql/item_sum.cc: Fixed bug in DISTINCT sql/sql_db.cc: Added test of namelen in check_db_name sql/sql_select.cc: Fixed bug in DISTINCT sql/sql_select.h: Fixed bug in DISTINCT sql/sql_table.cc: Fixed ALTER TABLE on MERGE tables sql/table.cc: Added test of namelen in check_db_name sql/table.h: Fixed ALTER TABLE on MERGE tables
Diffstat (limited to 'sql-bench')
-rw-r--r--sql-bench/crash-me.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index a62e042ffda..2ce5c73c9b2 100644
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -38,7 +38,7 @@
# as such, and clarify ones such as "mediumint" with comments such as
# "3-byte int" or "same as xxx".
-$version="1.54";
+$version="1.55";
use DBI;
use Getopt::Long;
@@ -1315,7 +1315,7 @@ report("default value for column",'create_default',
"drop table crash_q $drop_attr");
report("default value function for column",'create_default_func',
- "create table crash_q (q integer not null,q1 integer default (1+1)",
+ "create table crash_q (q integer not null,q1 integer default (1+1))",
"drop table crash_q $drop_attr");
report("temporary tables",'temporary_table',
@@ -1696,7 +1696,7 @@ if (!report("drop table with cascade/restrict","drop_restrict",
report("-- as comment (ANSI)","comment_--",
"select * from crash_me -- Testing of comments");
-report("// as comment (ANSI)","comment_//",
+report("// as comment","comment_//",
"select * from crash_me // Testing of comments");
report("# as comment","comment_#",
"select * from crash_me # Testing of comments");