diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-08-14 15:22:44 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-08-14 15:22:44 +0300 |
| commit | 9d779efebca4c17d355f035f7b1f67ba31bb72f5 (patch) | |
| tree | 9812a9a0314e383c93e3453fc4525170728a79bc /client/mysqlslap.c | |
| parent | 6c9e77ae3ad48ededd3e51728fd7182ae0e99350 (diff) | |
| parent | 3593bb4f50c4be593bb1b851d9637893c4bb0dc0 (diff) | |
| download | mariadb-git-9d779efebca4c17d355f035f7b1f67ba31bb72f5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
sql/log_event.cc:
manual merge
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index a550dcae260..78f9efe8bd2 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1354,7 +1354,7 @@ get_options(int *argc,char ***argv) } tmp_string= (char *)my_malloc(sbuf.st_size + 1, MYF(MY_ZEROFILL|MY_FAE|MY_WME)); - my_read(data_file, tmp_string, sbuf.st_size, MYF(0)); + my_read(data_file, (uchar*) tmp_string, sbuf.st_size, MYF(0)); tmp_string[sbuf.st_size]= '\0'; my_close(data_file,MYF(0)); parse_delimiter(tmp_string, &create_statements, delimiter[0]); @@ -1381,7 +1381,7 @@ get_options(int *argc,char ***argv) } tmp_string= (char *)my_malloc(sbuf.st_size + 1, MYF(MY_ZEROFILL|MY_FAE|MY_WME)); - my_read(data_file, tmp_string, sbuf.st_size, MYF(0)); + my_read(data_file, (uchar*) tmp_string, sbuf.st_size, MYF(0)); tmp_string[sbuf.st_size]= '\0'; my_close(data_file,MYF(0)); if (user_supplied_query) @@ -1412,7 +1412,7 @@ get_options(int *argc,char ***argv) } tmp_string= (char *)my_malloc(sbuf.st_size + 1, MYF(MY_ZEROFILL|MY_FAE|MY_WME)); - my_read(data_file, tmp_string, sbuf.st_size, MYF(0)); + my_read(data_file, (uchar*) tmp_string, sbuf.st_size, MYF(0)); tmp_string[sbuf.st_size]= '\0'; my_close(data_file,MYF(0)); if (user_supplied_pre_statements) @@ -1443,7 +1443,7 @@ get_options(int *argc,char ***argv) } tmp_string= (char *)my_malloc(sbuf.st_size + 1, MYF(MY_ZEROFILL|MY_FAE|MY_WME)); - my_read(data_file, tmp_string, sbuf.st_size, MYF(0)); + my_read(data_file, (uchar*) tmp_string, sbuf.st_size, MYF(0)); tmp_string[sbuf.st_size]= '\0'; my_close(data_file,MYF(0)); if (user_supplied_post_statements) @@ -2076,7 +2076,7 @@ print_conclusions_csv(conclusions *con) con->users, /* Children used */ con->avg_rows /* Queries run */ ); - my_write(csv_file, buffer, (uint)strlen(buffer), MYF(0)); + my_write(csv_file, (uchar*) buffer, (uint)strlen(buffer), MYF(0)); } void |