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

WL#3023 (Use locks in statement-like manner):

Browse Source 
Post-merge patches.
This commit is contained in:
mats@mysql.com
2006-03-09 03:56:14 +01:00
parent 9dace13548
commit 90215eb387
5 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_base.cc
View File

@ -2431,11 +2431,11 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name)
reused is on wrap-around, which means more than 4 billion table
shares open at the same time).
share->table_map_id is not ULONG_MAX.
share->table_map_id is not ~0UL.
*/
void assign_new_table_id(TABLE_SHARE *share)
{
static ulong last_table_id= ULONG_MAX;
static ulong last_table_id= ~0UL;
DBUG_ENTER("assign_new_table_id");
@ -2448,13 +2448,13 @@ void assign_new_table_id(TABLE_SHARE *share)
There is one reserved number that cannot be used. Remember to
change this when 6-byte global table id's are introduced.
*/
if (unlikely(tid == ULONG_MAX))
if (unlikely(tid == ~0UL))
tid= ++last_table_id;
share->table_map_id= tid;
DBUG_PRINT("info", ("table_id=%lu", tid));
/* Post conditions */
DBUG_ASSERT(share->table_map_id != ULONG_MAX);
DBUG_ASSERT(share->table_map_id != ~0UL);
DBUG_VOID_RETURN;
}