database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

5.0-opt -> 5.1-opt merge

Browse Source
This commit is contained in:
unknown
2007-06-12 18:41:56 +03:00
parent e53dfc6df4
commit 95ef943b9e
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/item_func.cc
View File

@ -3581,10 +3581,10 @@ longlong Item_func_release_lock::val_int()
} }
else 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, (int) ull->locked,
(long)ull->thread, (long)ull->thread_id,
(long)thd->real_id)); (long)thd->thread_id));
if (ull->locked && current_thd->thread_id == ull->thread_id) if (ull->locked && current_thd->thread_id == ull->thread_id)
{ {
DBUG_PRINT("info", ("release lock")); DBUG_PRINT("info", ("release lock"));

4
sql/sql_insert.cc
View File

@ -1419,8 +1419,8 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
goto before_trg_err; goto before_trg_err;
table->file->restore_auto_increment(prev_insert_id); table->file->restore_auto_increment(prev_insert_id);
if ((table->file->table_flags() & HA_PARTIAL_COLUMN_READ) || if ((table->file->ha_table_flags() & HA_PARTIAL_COLUMN_READ) ||
compare_record(table, thd->query_id)) compare_record(table))
{ {
if ((error=table->file->ha_update_row(table->record[1], if ((error=table->file->ha_update_row(table->record[1],
table->record[0]))) table->record[0])))

3
sql/sql_plugin.h
View File

@ -33,7 +33,8 @@ class sys_var;
*/ */
#define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \ #define SHOW_FUNC SHOW_FUNC, SHOW_KEY_CACHE_LONG, SHOW_KEY_CACHE_LONGLONG, \
SHOW_LONG_STATUS, SHOW_DOUBLE_STATUS, SHOW_HAVE, \ 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> #include <mysql/plugin.h>
#undef SHOW_FUNC #undef SHOW_FUNC
typedef enum enum_mysql_show_type SHOW_TYPE; typedef enum enum_mysql_show_type SHOW_TYPE;