bzr commit into mysql-6.0-runtime branch (kostja:2775)

[Konstantin Osipov]

#At file:///opt/local/work/mysql-6.0-runtime/

 2775 Konstantin Osipov	2008-12-08
      Don't use ha_rows for net_send_ok() affected_rows argument, use
      ulonglong. With -DBIG_TABLES ha_rows and ulonglong types are identical.
      We haven't been compiling without -DBIG_TABLES for a while.
      Still, in the network layer, use ulonglong, to simply be independent
      of this engine (and not network-) specific define.
modified:
  libmysqld/lib_sql.cc
  sql/protocol.cc
  sql/protocol.h

per-file messages:
  libmysqld/lib_sql.cc
    ha_rows -> ulonglong
  sql/protocol.cc
    ha_rows -> ulonglong
  sql/protocol.h
    ha_rows -> ulonglong
=== modified file 'libmysqld/lib_sql.cc'
--- a/libmysqld/lib_sql.cc	2008-12-08 11:29:15 +0000
+++ b/libmysqld/lib_sql.cc	2008-12-08 15:07:40 +0000
@@ -1031,7 +1031,7 @@ bool Protocol_binary::write()
 void
 net_send_ok(THD *thd,
             uint server_status, uint statement_warn_count,
-            ha_rows affected_rows, ulonglong id, const char *message)
+            ulonglong affected_rows, ulonglong id, const char *message)
 {
   DBUG_ENTER("emb_net_send_ok");
   MYSQL_DATA *data;

=== modified file 'sql/protocol.cc'
--- a/sql/protocol.cc	2008-12-05 23:47:51 +0000
+++ b/sql/protocol.cc	2008-12-08 15:07:40 +0000
@@ -30,7 +30,7 @@
 static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;
 void net_send_error_packet(THD *thd, uint sql_errno, const char *err);
 /* Declared non-static only because of the embedded library. */
-void net_send_ok(THD *, uint, uint, ha_rows, ulonglong, const char *);
+void net_send_ok(THD *, uint, uint, ulonglong, ulonglong, const char *);
 /* Declared non-static only because of the embedded library. */
 void net_send_eof(THD *thd, uint server_status, uint statement_warn_count);
 #ifndef EMBEDDED_LIBRARY
@@ -180,7 +180,7 @@ void net_send_error(THD *thd, uint sql_e
 void
 net_send_ok(THD *thd,
             uint server_status, uint statement_warn_count,
-            ha_rows affected_rows, ulonglong id, const char *message)
+            ulonglong affected_rows, ulonglong id, const char *message)
 {
   NET *net= &thd->net;
   uchar buff[MYSQL_ERRMSG_SIZE+10],*pos;
@@ -487,7 +487,7 @@ void Protocol::end_statement()
 */
 
 void Protocol::send_ok(uint server_status, uint statement_warn_count,
-                       ha_rows affected_rows, ulonglong last_insert_id,
+                       ulonglong affected_rows, ulonglong last_insert_id,
                        const char *message)
 {
   DBUG_ENTER("Protocol::send_ok");

=== modified file 'sql/protocol.h'
--- a/sql/protocol.h	2008-12-05 23:47:51 +0000
+++ b/sql/protocol.h	2008-12-08 15:07:40 +0000
@@ -50,7 +50,7 @@ protected:
                         CHARSET_INFO *fromcs, CHARSET_INFO *tocs);
 
   virtual void send_ok(uint server_status, uint statement_warn_count,
-                       ha_rows affected_rows, ulonglong last_insert_id,
+                       ulonglong affected_rows, ulonglong last_insert_id,
                        const char *message);
 
   virtual void send_eof(uint server_status, uint statement_warn_count);