bk commit into 5.1 tree (kostja:1.2642) BUG#12713

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-13 05:37:38+03:00, kostja@bodhi.(none) +2 -0
  Fix a compilation warning and a subtle bug with truncation of the 
  last_insert_id introduced by the patch for Bug#12713 (part 1)

  sql/sql_class.cc@stripped, 2007-12-13 05:37:34+03:00, kostja@bodhi.(none) +1 -1
    Fix a compilation warning and a subtle bug with truncation of the 
    last_insert_id introduced by the patch for Bug#12713 (part 1)

  sql/sql_class.h@stripped, 2007-12-13 05:37:35+03:00, kostja@bodhi.(none) +3 -3
    Fix a compilation warning and a subtle bug with truncation of the 
    last_insert_id introduced by the patch for Bug#12713 (part 1)

diff -Nrup a/sql/sql_class.cc b/sql/sql_class.cc
--- a/sql/sql_class.cc	2007-12-12 18:20:55 +03:00
+++ b/sql/sql_class.cc	2007-12-13 05:37:34 +03:00
@@ -383,7 +383,7 @@ Diagnostics_area::reset_diagnostics_area
 
 void
 Diagnostics_area::set_ok_status(THD *thd, ha_rows affected_rows_arg,
-                                ulong last_insert_id_arg,
+                                ulonglong last_insert_id_arg,
                                 const char *message_arg)
 {
   DBUG_ASSERT(! is_set());
diff -Nrup a/sql/sql_class.h b/sql/sql_class.h
--- a/sql/sql_class.h	2007-12-12 18:36:04 +03:00
+++ b/sql/sql_class.h	2007-12-13 05:37:35 +03:00
@@ -1003,7 +1003,7 @@ public:
   bool can_overwrite_status;
 
   void set_ok_status(THD *thd, ha_rows affected_rows_arg,
-                     ulong last_insert_id_arg,
+                     ulonglong last_insert_id_arg,
                      const char *message);
   void set_eof_status(THD *thd);
   void set_error_status(THD *thd, uint sql_errno_arg, const char *message_arg);
@@ -1034,7 +1034,7 @@ public:
   ha_rows affected_rows() const
   { DBUG_ASSERT(m_status == DA_OK); return m_affected_rows; }
 
-  ulong last_insert_id() const
+  ulonglong last_insert_id() const
   { DBUG_ASSERT(m_status == DA_OK); return m_last_insert_id; }
 
   uint total_warn_count() const
@@ -1080,7 +1080,7 @@ private:
     thd->first_successful_insert_id_in_prev_stmt, which is used
     to implement LAST_INSERT_ID().
   */
-  ulong      m_last_insert_id;
+  ulonglong   m_last_insert_id;
   /** The total number of warnings. */
   uint	     m_total_warn_count;
   enum_diagnostics_status m_status;