database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix a compilation warning and a subtle bug with truncation of the

Browse Source 
last_insert_id introduced by the patch for Bug#12713 (part 1)
This commit is contained in:
kostja@bodhi.(none)
2007-12-13 05:37:38 +03:00
parent 572ab7a6b0
commit 2789a12b6a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -383,7 +383,7 @@ Diagnostics_area::reset_diagnostics_area()
void void
Diagnostics_area::set_ok_status(THD *thd, ha_rows affected_rows_arg, 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) const char *message_arg)
{ {
DBUG_ASSERT(! is_set()); DBUG_ASSERT(! is_set());

6
sql/sql_class.h
View File

@ -1003,7 +1003,7 @@ public:
bool can_overwrite_status; bool can_overwrite_status;
void set_ok_status(THD *thd, ha_rows affected_rows_arg, void set_ok_status(THD *thd, ha_rows affected_rows_arg,
ulong last_insert_id_arg, ulonglong last_insert_id_arg,
const char *message); const char *message);
void set_eof_status(THD *thd); void set_eof_status(THD *thd);
void set_error_status(THD *thd, uint sql_errno_arg, const char *message_arg); void set_error_status(THD *thd, uint sql_errno_arg, const char *message_arg);
@ -1034,7 +1034,7 @@ public:
ha_rows affected_rows() const ha_rows affected_rows() const
{ DBUG_ASSERT(m_status == DA_OK); return m_affected_rows; } { 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; } { DBUG_ASSERT(m_status == DA_OK); return m_last_insert_id; }
uint total_warn_count() const uint total_warn_count() const
@ -1080,7 +1080,7 @@ private:
thd->first_successful_insert_id_in_prev_stmt, which is used thd->first_successful_insert_id_in_prev_stmt, which is used
to implement LAST_INSERT_ID(). to implement LAST_INSERT_ID().
*/ */
ulong m_last_insert_id; ulonglong m_last_insert_id;
/** The total number of warnings. */ /** The total number of warnings. */
uint m_total_warn_count; uint m_total_warn_count;
enum_diagnostics_status m_status; enum_diagnostics_status m_status;