FLUSH TABLE table_list

Fixes for RENAME TABLE
Portability fixes

4 files changed, 21 insertions, 7 deletions

diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index 19d358c6613..c86bcdccdaa 100755
--- a/sql-bench/crash-me.sh
+++ b/sql-bench/crash-me.sh
@@ -39,7 +39,7 @@
 # "3-byte int" or "same as xxx".
 
 
-$version="1.47";
+$version="1.48";
 
 use DBI;
 use Getopt::Long;
@@ -280,6 +280,14 @@ if ($dbh->do("create table crash_q (a integer, b integer,c CHAR(10))"))
 $dbh->do("drop table crash_q1");
 $dbh->do("drop table crash_q");
 
+report("rename table","rename_table",
+       "create table crash_q (a integer, b integer,c CHAR(10))",
+       "rename table crash_q to crash_q1",
+       "drop table crash_q1");
+# Make sure both tables will be dropped, even if rename fails.
+$dbh->do("drop table crash_q1");
+$dbh->do("drop table crash_q");
+
 if ($dbh->do("create table crash_q (a integer, b integer,c CHAR(10))") &&
     $dbh->do("create table crash_q1 (a integer, b integer,c CHAR(10) not null)"))
 {
@@ -905,6 +913,9 @@ try_and_report("Automatic rowid", "automatic_rowid",
    ["MIN on numbers","min","min(a)",1,0],
    ["MIN on strings","min_str","min(b)","a",1],
    ["SUM","sum","sum(a)",1,0],
+   ["ANY","any","any(a)",$logical_value,0],
+   ["EVERY","every","every(a)",$logical_value,0],
+   ["SOME","some","some(a)",$logical_value,0],
    );
 
 @extra_group_functions=
diff --git a/sql-bench/limits/mysql.cfg b/sql-bench/limits/mysql.cfg
index aebb879a574..fe724549bfb 100644
--- a/sql-bench/limits/mysql.cfg
+++ b/sql-bench/limits/mysql.cfg
@@ -1,4 +1,4 @@
-#This file is automaticly generated by crash-me 1.47
+#This file is automaticly generated by crash-me 1.48
 
 NEG=yes					# update of column= -column
 Need_cast_for_null=no			# Need to cast NULL for arithmetic
@@ -36,7 +36,7 @@ constraint_check=no			# Column constraints
 constraint_check_table=no		# Table constraints
 constraint_null=yes			# NULL constraint (SyBase style)
 crash_me_safe=no			# crash me safe
-crash_me_version=1.47			# crash me version
+crash_me_version=1.48			# crash me version
 create_default=yes			# default value for column
 create_default_func=no			# default value function for column
 create_if_not_exists=yes		# create table if not exists
@@ -283,14 +283,17 @@ group_func_extra_count_distinct_list=yes	# Group function COUNT(DISTINCT expr,ex
 group_func_extra_std=yes		# Group function STD
 group_func_extra_stddev=yes		# Group function STDDEV
 group_func_extra_variance=no		# Group function VARIANCE
+group_func_sql_any=no			# Group function ANY
 group_func_sql_avg=yes			# Group function AVG
 group_func_sql_count_*=yes		# Group function COUNT (*)
 group_func_sql_count_column=yes		# Group function COUNT column name
 group_func_sql_count_distinct=yes	# Group function COUNT(DISTINCT expr)
+group_func_sql_every=no			# Group function EVERY
 group_func_sql_max=yes			# Group function MAX on numbers
 group_func_sql_max_str=yes		# Group function MAX on strings
 group_func_sql_min=yes			# Group function MIN on numbers
 group_func_sql_min_str=yes		# Group function MIN on strings
+group_func_sql_some=no			# Group function SOME
 group_func_sql_sum=yes			# Group function SUM
 group_functions=yes			# Group functions
 has_true_false=no			# TRUE and FALSE
@@ -384,7 +387,7 @@ select_limit2=yes			# SELECT with LIMIT #,#
 select_string_size=1048565		# constant string size in SELECT
 select_table_update=no			# Update with sub select
 select_without_from=yes			# SELECT without FROM
-server_version=MySQL 3.23.19 beta debug	# server version
+server_version=MySQL 3.23.22 beta debug	# server version
 simple_joins=yes			# ANSI SQL simple joins
 storage_of_float=round			# Storage of float values
 subqueries=no				# subqueries
diff --git a/sql-bench/server-cfg.sh b/sql-bench/server-cfg.sh
index b986b4b519e..c854fc5a962 100755
--- a/sql-bench/server-cfg.sh
+++ b/sql-bench/server-cfg.sh
@@ -554,7 +554,7 @@ sub new
   $limits{'max_index_parts'}	= 16;		# Is this true ?
   $limits{'max_text_size'}	= 7000;		# 8000 crashes pg 6.3
   $limits{'query_size'}		= 16777216;
-  $limits{'unique_index'}	= 0; # Unique index works or not
+  $limits{'unique_index'}	= 1; # Unique index works or not
 
   # the different cases per query ...
   $smds{'q1'} 	= 'b'; # with time
diff --git a/sql-bench/test-insert.sh b/sql-bench/test-insert.sh
index b38d132d356..af5569510c7 100755
--- a/sql-bench/test-insert.sh
+++ b/sql-bench/test-insert.sh
@@ -223,8 +223,8 @@ if ($limits->{'unique_index'})
   {
     $tmpvar^= ((($tmpvar + 63) + $i)*3 % $opt_loop_count);
     $tmp=$tmpvar % ($total_rows);
-    $tmpquery = "$query ($tmp,1,2,'D')";
-    if (!$dbh->do($tmpquery))
+    $tmpquery = "$query ($tmp,$tmp,2,'D')";
+    if ($dbh->do($tmpquery))
     {
       die "Didn't get an error when inserting duplicate record $tmp\n";
     }