diff options
| -rw-r--r-- | sql/item_func.cc | 6 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 4 | ||||
| -rw-r--r-- | sql/sql_plugin.h | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 606bb5fd561..70859aeb457 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3581,10 +3581,10 @@ longlong Item_func_release_lock::val_int() } else { - DBUG_PRINT("info", ("ull->locked=%d ull->thread=%ld thd=%ld", + DBUG_PRINT("info", ("ull->locked=%d ull->thread=%lu thd=%lu", (int) ull->locked, - (long)ull->thread, - (long)thd->real_id)); + (long)ull->thread_id, + (long)thd->thread_id)); if (ull->locked && current_thd->thread_id == ull->thread_id) { DBUG_PRINT("info", ("release lock")); diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 66c48772c4e..0ce52779ce1 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1419,8 +1419,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info) goto before_trg_err; table->file->restore_auto_increment(prev_insert_id); - if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) || - compare_record(table, thd->query_id)) + if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) || + compare_record(table)) { if ((error=table->file->ha_update_row(table->record[1], table->record[0]))) diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index 70ce21a64da..e8f2cb6ee5e 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -33,7 +33,8 @@ class sys_var; */ #define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \ SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \ - SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH + SHOW_MY_BOOL, SHOW_HA_ROWS, SHOW_SYS, SHOW_LONG_NOFLUSH, \ + SHOW_LONGLONG_STATUS #include <mysql/plugin.h> #undef SHOW_FUNC typedef enum enum_mysql_show_type SHOW_TYPE; |