diff options
| -rw-r--r-- | sql/sql_insert.cc | 19 | ||||
| -rw-r--r-- | sql/sql_load.cc | 4 | ||||
| -rw-r--r-- | sql/sql_table.cc | 4 | ||||
| -rw-r--r-- | sql/sql_update.cc | 8 |
4 files changed, 17 insertions, 18 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 091de9d406f..947205949f1 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -404,13 +404,12 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, { char buff[160]; if (duplic == DUP_IGNORE) - sprintf(buff,ER(ER_INSERT_INFO),info.records, - (lock_type == TL_WRITE_DELAYED) ? 0 : - info.records-info.copied, - thd->cuted_fields); + sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records, + (lock_type == TL_WRITE_DELAYED) ? (ulong) 0 : + (ulong) (info.records - info.copied), (ulong) thd->cuted_fields); else - sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted, - thd->cuted_fields); + sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records, + (ulong) info.deleted, (ulong) thd->cuted_fields); ::send_ok(thd,info.copied+info.deleted,(ulonglong)id,buff); } free_underlaid_joins(thd, &thd->lex.select_lex); @@ -1494,11 +1493,11 @@ bool select_insert::send_eof() { char buff[160]; if (info.handle_duplicates == DUP_IGNORE) - sprintf(buff,ER(ER_INSERT_INFO),info.records,info.records-info.copied, - thd->cuted_fields); + sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records, + (ulong) (info.records - info.copied), (ulong) thd->cuted_fields); else - sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted, - thd->cuted_fields); + sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records, + (ulong) info.deleted, (ulong) thd->cuted_fields); ::send_ok(thd,info.copied+info.deleted,last_insert_id,buff); return 0; } diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 12acfb9b5df..d030eaf617c 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -318,8 +318,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, error= -1; // Error on read goto err; } - sprintf(name,ER(ER_LOAD_INFO),info.records,info.deleted, - info.records-info.copied,thd->cuted_fields); + sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted, + (ulong) (info.records - info.copied), (ulong) thd->cuted_fields); send_ok(thd,info.copied+info.deleted,0L,name); // on the slave thd->query is never initialized if (!thd->slave_thread) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 33a59e540f8..2e6585583ba 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2416,8 +2416,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, query_cache_invalidate3(thd, table_list, 0); end_temporary: - sprintf(tmp_name,ER(ER_INSERT_INFO),(ulong) (copied+deleted), - (ulong) deleted, thd->cuted_fields); + sprintf(tmp_name, ER(ER_INSERT_INFO), (ulong) (copied + deleted), + (ulong) deleted, (ulong) thd->cuted_fields); send_ok(thd,copied+deleted,0L,tmp_name); thd->some_tables_deleted=0; DBUG_RETURN(0); diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 989d17b006b..e1c28dd0e4d 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -373,8 +373,8 @@ int mysql_update(THD *thd, else { char buff[80]; - sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated, - (long) thd->cuted_fields); + sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated, + (ulong) thd->cuted_fields); send_ok(thd, (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated, thd->insert_id_used ? thd->insert_id() : 0L,buff); @@ -993,8 +993,8 @@ bool multi_update::send_eof() } - sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated, - (long) thd->cuted_fields); + sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated, + (ulong) thd->cuted_fields); ::send_ok(thd, (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated, thd->insert_id_used ? thd->insert_id() : 0L,buff); |