From 31ba88c0c17e7a3eca365f104e2f129af7f07ee5 Mon Sep 17 00:00:00 2001
From: unknown <monty@mashka.mysql.fi>
Date: Tue, 29 Oct 2002 22:56:30 +0200
Subject: Added --skip-safemalloc to mysqltest Added bug fix from 3.23 for AIX
 4.3.3 and gcc 3.x Small change in EXCHANGE output Propagate open-files-limit
 from mysqld_safe -> mysqld Fixed speed bug in GROUP BY Added quotes around
 database name in CREATE DATABASE db_name (for binary log)

BitKeeper/etc/ignore:
  added stamp-h1
Docs/manual.texi:
  Added 4.1 manual section
  Updated changelog
client/mysqltest.c:
  Added --skip-safemalloc
include/my_global.h:
  Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x
mysql-test/mysql-test-run.sh:
  Start mysqltest with --skip-safemalloc (To get it faster)
mysql-test/r/bdb.result:
  Update for new EXPLAIN output
mysql-test/r/compare.result:
  Update for new EXPLAIN output
mysql-test/r/create.result:
  Update for new EXPLAIN output
mysql-test/r/distinct.result:
  Update for new EXPLAIN output
mysql-test/r/explain.result:
  Update for new EXPLAIN output
mysql-test/r/group_by.result:
  Update for new EXPLAIN output
mysql-test/r/heap.result:
  Update for new EXPLAIN output
mysql-test/r/innodb.result:
  Update for new EXPLAIN output
mysql-test/r/join_outer.result:
  Update for new EXPLAIN output
mysql-test/r/key_diff.result:
  Update for new EXPLAIN output
mysql-test/r/merge.result:
  Update for new EXPLAIN output
mysql-test/r/null_key.result:
  Update for new EXPLAIN output
mysql-test/r/order_by.result:
  Update for new EXPLAIN output
mysql-test/r/select.result:
  Update for new EXPLAIN output
mysql-test/r/temp_table.result:
  Fixed speed bug in GROUP BY
mysql-test/r/type_datetime.result:
  Update for new EXPLAIN output
mysql-test/r/user_var.result:
  Update for new EXPLAIN output
mysql-test/r/variables.result:
  Removed variable safe_show_database
mysql-test/t/temp_table.test:
  Fixed speed bug in GROUP BY
mysql-test/t/variables.test:
  Removed not used variable safe_show_databases
scripts/mysqld_safe.sh:
  Propagate open-files-limit from mysqld_safe -> mysqld
sql/mysqld.cc:
  Removed variable safe_show_database
sql/set_var.cc:
  Removed variable safe_show_database
sql/slave.cc:
  Updated error message
sql/sql_db.cc:
  Added quotes around database name in CREATE DATABASE db_name
sql/sql_select.cc:
  Fixed speed bug in GROUP BY
---
 client/mysqltest.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'client/mysqltest.c')

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 533713b4f43..20d277ca969 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -91,7 +91,7 @@
 
 
 enum {OPT_MANAGER_USER=256,OPT_MANAGER_HOST,OPT_MANAGER_PASSWD,
-      OPT_MANAGER_PORT,OPT_MANAGER_WAIT_TIMEOUT};
+      OPT_MANAGER_PORT,OPT_MANAGER_WAIT_TIMEOUT, OPT_SKIP_SAFEMALLOC};
 
 static int record = 0, opt_sleep=0;
 static char *db = 0, *pass=0;
@@ -1845,6 +1845,9 @@ static struct my_option my_long_options[] =
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"silent", 's', "Suppress all normal output. Synonym for --quiet.",
    (gptr*) &silent, (gptr*) &silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"skip-safemalloc", OPT_SKIP_SAFEMALLOC,
+   "Don't use the memory allocation checking", 0, 0, 0, GET_NO_ARG, NO_ARG,
+   0, 0, 0, 0, 0, 0},
   {"sleep", 'T', "Sleep always this many seconds on sleep commands",
    (gptr*) &opt_sleep, (gptr*) &opt_sleep, 0, GET_INT, REQUIRED_ARG, 0, 0, 0,
    0, 0, 0},
@@ -1944,6 +1947,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     if (read_server_arguments(argument))
       die(NullS);
     break;
+  case OPT_SKIP_SAFEMALLOC:
+#ifdef SAFEMALLOC
+    sf_malloc_quick=1;
+#endif
+    break;
   case 'V':
     print_version();
     exit(0);
@@ -2301,6 +2309,7 @@ static void var_from_env(const char* name, const char* def_val)
 static void init_var_hash()
 {
   VAR* v;
+  DBUG_ENTER("init_var_hash");
   if (hash_init(&var_hash, 1024, 0, 0, get_var_key, var_free, MYF(0)))
     die("Variable hash initialization failed");
   var_from_env("MASTER_MYPORT", "9306");
@@ -2309,6 +2318,7 @@ static void init_var_hash()
   var_from_env("BIG_TEST", opt_big_test ? "1" : "0");
   v=var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "63",0);
   hash_insert(&var_hash, (byte*)v);
+  DBUG_VOID_RETURN;
 }
 
 
-- 
cgit v1.2.1