diff options
| author | unknown <monty@mysql.com> | 2005-12-25 16:35:15 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-12-25 16:35:15 +0200 |
| commit | 66f962d808111c63e4aa03371b5520beb72c3a73 (patch) | |
| tree | 6773bb97a728413d2a9b1b8f855448f98d699f4a /client | |
| parent | 4348dc672fa4a5690bd9adb954fe5988b7593dd9 (diff) | |
| parent | c493d1026029d285dffa80088c8dc084bc265571 (diff) | |
| download | mariadb-git-66f962d808111c63e4aa03371b5520beb72c3a73.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
client/mysqlslap.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlslap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 6898f96f674..bd5635d40f4 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1023,7 +1023,7 @@ run_scheduler(statement *stmts, case 0: /* child */ DBUG_PRINT("info", ("fork returned 0, calling task(\"%s\"), pid %d gid %d", - script, pid, getgid())); + stmts->string, pid, getgid())); if (verbose >= 2) fprintf(stderr, "%s: fork returned 0, calling task pid %d gid %d\n", @@ -1071,7 +1071,7 @@ run_task(statement *qstmt) MYSQL_ROW row; DBUG_ENTER("run_task"); - DBUG_PRINT("info", ("task script \"%s\"", script)); + DBUG_PRINT("info", ("task script \"%s\"", qstmt->string)); mysql_init(&mysql); @@ -1156,9 +1156,10 @@ load_data(statement *load_stmt) { 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", - my_progname, (uint)ptr->length, ptr->string, mysql_error(&mysql)); + my_progname, (uint)ptr->length, ptr->string, + mysql_error(&mysql)); exit(1); } } |