diff options
| author | ram@mysql.r18.ru <> | 2003-07-14 15:32:31 +0500 |
|---|---|---|
| committer | ram@mysql.r18.ru <> | 2003-07-14 15:32:31 +0500 |
| commit | 0f47087e2217cbbb39bba2c8ceb0e9de38254dbf (patch) | |
| tree | 2eeea8f2a1c3eed8b966d312addf5c46318c9e11 /sql/sql_insert.cc | |
| parent | 92b3a231d45928e7de64fa2e8936b877bf6049c4 (diff) | |
| download | mariadb-git-0f47087e2217cbbb39bba2c8ceb0e9de38254dbf.tar.gz | |
Fix for the bug #841: wrong number of warnings
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 19 |
1 files changed, 9 insertions, 10 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; } |