diff options
author | unknown <mats@mysql.com> | 2006-03-09 03:56:14 +0100 |
---|---|---|
committer | unknown <mats@mysql.com> | 2006-03-09 03:56:14 +0100 |
commit | 5a9b94112bc8a4838259e7b04b18cc36a95651ef (patch) | |
tree | 78acd1416bee65b7809fad4f7b068915f3a3682c /sql/table.cc | |
parent | 4286a0ada243ccca0eb78b53adced35bc68f3690 (diff) | |
download | mariadb-git-5a9b94112bc8a4838259e7b04b18cc36a95651ef.tar.gz |
WL#3023 (Use locks in statement-like manner):
Post-merge patches.
mysql-test/t/disabled.def:
Disabling test that fails due to no-error patch.
sql/log_event.cc:
Using definite constant instead of machine-dependent constant.
Handling case where null_bytes can be zero.
sql/sql_base.cc:
Using definite constant instead of machine-dependent constant.
sql/sql_class.cc:
Using definite constant instead of machine-dependent constant.
sql/table.cc:
Using definite constant instead of machine-dependent constant.
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index b13fb347ee8..b7b235dc180 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -145,7 +145,7 @@ TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key, elsewhere, and then assign a table map id inside open_table() under the protection of the LOCK_open mutex. */ - share->table_map_id= ULONG_MAX; + share->table_map_id= ~0UL; #endif memcpy((char*) &share->mem_root, (char*) &mem_root, sizeof(mem_root)); @@ -204,7 +204,7 @@ void init_tmp_table_share(TABLE_SHARE *share, const char *key, anyway to be able to catch errors. */ share->table_map_version= ~(ulonglong)0; - share->table_map_id= ULONG_MAX; + share->table_map_id= ~0UL; #endif DBUG_VOID_RETURN; |