diff options
| author | unknown <serg@serg.mylan> | 2005-12-29 21:29:02 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-12-29 21:29:02 +0100 |
| commit | 79175e861c769ae527af87e58dddfa0815aa5d81 (patch) | |
| tree | 15e551371c48425f7035589e5041bb6f637371be /client/mysqlslap.c | |
| parent | f8df12908c92a9e8bc290a5cef3987c1c807f352 (diff) | |
| download | mariadb-git-79175e861c769ae527af87e58dddfa0815aa5d81.tar.gz | |
after pull fixes
client/mysqlslap.c:
compilation errors
include/plugin.h:
comments corrected
sql/sql_plugin.cc:
LEX_STRING instead of char*,
MYSQL_HANDLERTON_INTERFACE_VERSION instead of 0x0000
sql/sql_plugin.h:
LEX_STRING instead of char*
sql/sql_show.cc:
LEX_STRING instead of char*.
STRING_WITH_LEN works only on string literals, not on expressions
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 5963525fc0e..4b243361316 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -220,6 +220,7 @@ int main(int argc, char **argv) int client_flag= 0; double load_difference; double query_difference; + statement *eptr; int x; DBUG_ENTER("main"); @@ -278,7 +279,6 @@ int main(int argc, char **argv) } // Main interations loop - statement *eptr; for (eptr= engine_statements; eptr; eptr= eptr->next) { if (!opt_silent) @@ -1069,11 +1069,11 @@ run_scheduler(statement *stmts, ulonglong client_limit= 0; File lock_file; struct timeval start_time, end_time; + DBUG_ENTER("run_scheduler"); if (limit) client_limit= limit / concur; - DBUG_ENTER("run_scheduler"); /* reset to 0 */ children_spawned= 0; |