From 07bd25c9f570bfa0bc2ee4745069f16a21676927 Mon Sep 17 00:00:00 2001 From: "brian@zim.(none)" <> Date: Fri, 10 Mar 2006 08:54:12 -0800 Subject: [PATCH] This is a patch to test the default schema location. --- client/mysqlslap.c | 6 +++--- mysql-test/t/mysqlslap.test | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 23eba64c332..e1136bd3a69 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -295,9 +295,9 @@ int main(int argc, char **argv) client_flag|= CLIENT_MULTI_RESULTS; if (!opt_only_print) { - if (!(mysql_real_connect(&mysql,host,user,opt_password, - argv[0],opt_mysql_port,opt_mysql_unix_port, - client_flag))) + if (!(mysql_real_connect(&mysql, host, user, opt_password, + NULL, opt_mysql_port, + opt_mysql_unix_port, client_flag))) { fprintf(stderr,"%s: %s\n",my_progname,mysql_error(&mysql)); free_defaults(defaults_argv); diff --git a/mysql-test/t/mysqlslap.test b/mysql-test/t/mysqlslap.test index fb44f5c29d5..01add0d7da8 100644 --- a/mysql-test/t/mysqlslap.test +++ b/mysql-test/t/mysqlslap.test @@ -12,3 +12,5 @@ --exec $MYSQL_SLAP --only-print --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" --engine="heap,myisam" --exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --delimiter=";" --query="select * from t1;select * from t2" --create="CREATE TABLE t1 (id int, name varchar(64)); create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2')" + +--exec $MYSQL_SLAP --silent --concurrency=5 --iterations=20 --number-int-cols=2 --number-char-cols=3 --auto-generate-sql --create-schema=test_env