diff options
| author | unknown <serg@serg.mylan> | 2006-02-15 00:01:46 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2006-02-15 00:01:46 +0100 |
| commit | 832dd46f49907334719f4564630f590897e900b8 (patch) | |
| tree | 04e10e6c13dff5a244c5e0b21952430d9eca324a /client/mysqlslap.c | |
| parent | 0ae5e4c1ef58f5b9e2eef779d00e3c03fc13ca0b (diff) | |
| parent | d3ee9abf2a15d96b6779b33ebe7606e7d53b8cd1 (diff) | |
| download | mariadb-git-832dd46f49907334719f4564630f590897e900b8.tar.gz | |
Automerge
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
client/mysqlslap.c:
SCCS merged
configure.in:
SCCS merged
libmysql/libmysql.c:
SCCS merged
mysys/my_init.c:
SCCS merged
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index fddc5cffac6..c0986c2d867 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -730,10 +730,10 @@ build_query_string(void) strmov(ptr->string, query_string.str); DBUG_PRINT("info", ("user_supplied_query %s", ptr->string)); dynstr_free(&query_string); - DBUG_RETURN(0); + DBUG_RETURN(ptr); } -static int +static int get_options(int *argc,char ***argv) { int ho_error; |