Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.r18.ru:/usr/home/ram/work/4.1

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;
   }

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)

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);

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);