Commit c493d102 authored by unknown's avatar unknown

Fixed compile errors (when compiling in debug mode)


BitKeeper/etc/ignore:
  added storage/archive/archive_test
parent a6ef1dc3
...@@ -1659,3 +1659,4 @@ vio/viotest.cpp ...@@ -1659,3 +1659,4 @@ vio/viotest.cpp
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
client/mysqlslap client/mysqlslap
storage/archive/archive_test
...@@ -953,7 +953,7 @@ run_scheduler(statement *stmts, ...@@ -953,7 +953,7 @@ run_scheduler(statement *stmts,
case 0: case 0:
/* child */ /* child */
DBUG_PRINT("info", ("fork returned 0, calling task(\"%s\"), pid %d gid %d", DBUG_PRINT("info", ("fork returned 0, calling task(\"%s\"), pid %d gid %d",
script, pid, getgid())); stmts->string, pid, getgid()));
if (verbose >= 2) if (verbose >= 2)
fprintf(stderr, fprintf(stderr,
"%s: fork returned 0, calling task pid %d gid %d\n", "%s: fork returned 0, calling task pid %d gid %d\n",
...@@ -1001,7 +1001,7 @@ run_task(statement *qstmt) ...@@ -1001,7 +1001,7 @@ run_task(statement *qstmt)
MYSQL_ROW row; MYSQL_ROW row;
DBUG_ENTER("run_task"); DBUG_ENTER("run_task");
DBUG_PRINT("info", ("task script \"%s\"", script)); DBUG_PRINT("info", ("task script \"%s\"", qstmt->string));
mysql_init(&mysql); mysql_init(&mysql);
...@@ -1086,9 +1086,10 @@ load_data(statement *load_stmt) ...@@ -1086,9 +1086,10 @@ load_data(statement *load_stmt)
{ {
if (mysql_real_query(&mysql, ptr->string, ptr->length)) if (mysql_real_query(&mysql, ptr->string, ptr->length))
{ {
DBUG_PRINT("info", ("iteration %d with INSERT statement %s", script)); DBUG_PRINT("info", ("iteration %d with INSERT statement %s", ptr->string));
fprintf(stderr,"%s: Cannot insert into table using sql: %.*s ERROR: %s\n", fprintf(stderr,"%s: Cannot insert into table using sql: %.*s ERROR: %s\n",
my_progname, (uint)ptr->length, ptr->string, mysql_error(&mysql)); my_progname, (uint)ptr->length, ptr->string,
mysql_error(&mysql));
exit(1); exit(1);
} }
} }
......
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