database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Fixes during review of new pushed code

Browse Source 
Removed duplicate usage of TMP_TABLE_FORCE_MYISAM by making 'options' longlong
This commit is contained in:
monty@mysql.com
2005-08-12 13:54:42 +03:00
parent e80252e53c
commit 4c0d23e156
18 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -1246,7 +1246,8 @@ public:
update auto-updatable fields (like auto_increment and timestamp).
*/
query_id_t query_id, warn_id;
ulong options, thread_id, col_access;
ulonglong options;
ulong thread_id, col_access;
/* Statement id is thread-wide. This counter is used to generate ids */
ulong statement_id_counter;
@ -1498,7 +1499,7 @@ public:
#define tmp_disable_binlog(A) \
{ulong tmp_disable_binlog__save_options= (A)->options; \
{ulonglong tmp_disable_binlog__save_options= (A)->options; \
(A)->options&= ~OPTION_BIN_LOG
#define reenable_binlog(A) (A)->options= tmp_disable_binlog__save_options;}