Commit c7513d18 authored by serg@serg.mylan's avatar serg@serg.mylan

crazy - for the last week mysqlslap.test was generating 400 sigsegvs

per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
parent 20e9ab36
...@@ -1086,6 +1086,9 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit) ...@@ -1086,6 +1086,9 @@ run_scheduler(stats *sptr, statement *stmts, uint concur, ulonglong limit)
int status, pid; int status, pid;
pid= wait(&status); pid= wait(&status);
DBUG_PRINT("info", ("Parent: child %d status %d", pid, status)); DBUG_PRINT("info", ("Parent: child %d status %d", pid, status));
if (status != 0)
printf("%s: Child %d died with the status %d\n",
my_progname, pid, status);
} }
} }
#endif #endif
...@@ -1122,11 +1125,11 @@ run_task(thread_context *con) ...@@ -1122,11 +1125,11 @@ run_task(thread_context *con)
DBUG_PRINT("info", ("trying to connect to host %s as user %s", host, user)); DBUG_PRINT("info", ("trying to connect to host %s as user %s", host, user));
lock_file= my_open(lock_file_str, O_RDWR, MYF(0)); lock_file= my_open(lock_file_str, O_RDWR, MYF(0));
my_lock(lock_file, F_RDLCK, 0, F_TO_EOF, MYF(0)); my_lock(lock_file, F_RDLCK, 0, F_TO_EOF, MYF(0));
if (!opt_only_print) if (!opt_only_print)
{ {
if (!(mysql= mysql_real_connect(NULL, host, user, opt_password, if (!(mysql= mysql_real_connect(mysql, host, user, opt_password,
create_schema_string, create_schema_string,
opt_mysql_port, opt_mysql_port,
opt_mysql_unix_port, opt_mysql_unix_port,
0))) 0)))
{ {
...@@ -1136,12 +1139,12 @@ run_task(thread_context *con) ...@@ -1136,12 +1139,12 @@ run_task(thread_context *con)
} }
DBUG_PRINT("info", ("connected.")); DBUG_PRINT("info", ("connected."));
queries= 0; queries= 0;
limit_not_met: limit_not_met:
for (ptr= con->stmt; ptr && ptr->length; ptr= ptr->next) for (ptr= con->stmt; ptr && ptr->length; ptr= ptr->next)
{ {
if (opt_only_print) if (opt_only_print)
{ {
printf("%.*s;\n", (uint)ptr->length, ptr->string); printf("%.*s;\n", (uint)ptr->length, ptr->string);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment