Removed mysql_ssl_clear()

Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.

2 files changed, 27 insertions, 18 deletions

diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh
index 9572143ae53..d66e8f47d6a 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.57";
+$version="1.58";
 
 use DBI;
 use Getopt::Long;
@@ -2186,20 +2186,20 @@ EOF
   print <<EOF;
 
 Some of the tests you are about to execute may require a lot of
-memory.  Your tests WILL adversely affect system performance. It's
+memory.  Your tests WILL adversely affect system performance. It\'s
 not uncommon that either this crash-me test program, or the actual
 database back-end, will DIE with an out-of-memory error. So might
 any other program on your system if it requests more memory at the
 wrong time.
 
 Note also that while crash-me tries to find limits for the database server
-it will make a lot of queries that can't be categorized as 'normal'.  It's
+it will make a lot of queries that can\'t be categorized as \'normal\'.  It\'s
 not unlikely that crash-me finds some limit bug in your server so if you
 run this test you have to be prepared that your server may die during it!
 
 We, the creators of this utility, are not responsible in any way if your
 database server unexpectedly crashes while this program tries to find the
-limitations of your server. By accepting the following question with 'yes',
+limitations of your server. By accepting the following question with \'yes\',
 you agree to the above!
 
 You have been warned!
@@ -2468,7 +2468,6 @@ sub report
   print "$prompt: ";
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
     save_config_data($limit,safe_query(\@queries) ? "yes" : "no",$prompt);
   }
   print "$limits{$limit}\n";
@@ -2481,7 +2480,6 @@ sub report_fail
   print "$prompt: ";
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
     save_config_data($limit,safe_query(\@queries) ? "no" : "yes",$prompt);
   }
   print "$limits{$limit}\n";
@@ -2498,7 +2496,7 @@ sub report_one
   print "$prompt: ";
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
+    save_incomplete($limit,$prompt);
     $result="no";
     foreach $query (@$queries)
     {
@@ -2524,7 +2522,7 @@ sub report_result
   print "$prompt: ";
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
+    save_incomplete($limit,$prompt);
     $error=safe_query_result($query,"1",2);
     save_config_data($limit,$error ? "not supported" : $last_result,$prompt);
   }
@@ -2537,7 +2535,7 @@ sub report_trans
   my ($limit,$queries,$check,$clear)=@_;
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
+    save_incomplete($limit,$prompt);
     eval {undef($dbh->{AutoCommit})};
     if (!$@)
     {
@@ -2579,7 +2577,7 @@ sub check_and_report
   print "$prompt: " if (!defined($skip_prompt));
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
+    save_incomplete($limit,$prompt);
     $tmp=1-safe_query(\@$pre);
     $tmp=safe_query_result($query,$answer,$string_type) if (!$tmp);
     safe_query(\@$post);
@@ -2615,7 +2613,7 @@ sub try_and_report
 
   if (!defined($limits{$limit}))
   {
-    save_config_data($limit,"incompleted",$prompt);
+    save_incomplete($limit,$prompt);
     $type="no";			# Not supported
     foreach $test (@tests)
     {
@@ -2695,7 +2693,8 @@ sub safe_query_result
     $sth->finish;
     return ($result_type == 8) ? 0 : 1;
   }
-  if($result_type == 8) {
+  if ($result_type == 8)
+  {
     $sth->finish;
     return 1;
   }
@@ -2787,7 +2786,7 @@ sub find_limit()
     print "$end (cache)\n";
     return $end;
   }
-  save_config_data($limit,"incompleted",$prompt);
+  save_incomplete($limit,$prompt);
 
   if (defined($query->{'init'}) && !defined($end=$limits{'restart'}{'tohigh'}))
   {
@@ -2961,6 +2960,16 @@ sub save_all_config_data
   close CONFIG_FILE;
 }
 
+#
+# Save 'incomplete' in the limits file to be able to continue if
+# crash-me dies because of a bug in perl/DBI
+
+sub save_incomplete
+{
+  my ($limit,$prompt)= @_;
+  save_config_data($limit,"incompleted",$prompt) if ($opt_restart);
+}
+
 
 sub check_repeat
 {
diff --git a/sql-bench/limits/mysql.cfg b/sql-bench/limits/mysql.cfg
index cd4aea7dcf5..306ce2d7b33 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.57
+#This file is automaticly generated by crash-me 1.58
 
 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=yes			# crash me safe
-crash_me_version=1.57			# crash me version
+crash_me_version=1.58			# 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
@@ -333,7 +333,7 @@ max_char_size=255			# max char() size
 max_column_name=64			# column name length
 max_columns=3398			# Columns in table
 max_conditions=85660			# OR and AND in WHERE
-max_expressions=856			# simple expressions
+max_expressions=686			# simple expressions
 max_index=32				# max index
 max_index_length=500			# index length
 max_index_name=64			# index name length
@@ -343,7 +343,7 @@ max_index_varchar_part_length=255	# index varchar part length
 max_row_length=65534			# max table row length (without blobs)
 max_row_length_with_null=65502		# table row length with nulls (without blobs)
 max_select_alias_name=+512		# select alias name length
-max_stack_expression=856		# stacked expressions
+max_stack_expression=490		# stacked expressions
 max_table_alias_name=+512		# table alias name length
 max_table_name=64			# table name length
 max_text_size=1048543			# max text or blob size
@@ -396,7 +396,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 4.0.2 alpha debug	# server version
+server_version=MySQL 4.0.2 alpha	# server version
 simple_joins=yes			# ANSI SQL simple joins
 storage_of_float=round			# Storage of float values
 subqueries=no				# subqueries