1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: replace a magic constant with a define

Browse Source
This commit is contained in:
Sergei Golubchik 2019-05-11 16:56:41 +02:00
parent d199591cf2
commit 8feb78ef53
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_truncate.cc
View File

@ -319,7 +319,7 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref,
TABLE_SHARE *share= tdc_acquire_share(thd, table_ref, GTS_TABLE | GTS_VIEW);
if (share == NULL)
DBUG_RETURN(TRUE);
DBUG_ASSERT(share != (TABLE_SHARE*)1);
DBUG_ASSERT(share != UNUSABLE_TABLE_SHARE);
versioned= share->versioned;
sequence= share->table_type == TABLE_TYPE_SEQUENCE;

2
sql/table.h
View File

@ -1025,6 +1025,8 @@ struct TABLE_SHARE
void set_overlapped_keys();
};
/* not NULL, but cannot be dereferenced */
#define UNUSABLE_TABLE_SHARE ((TABLE_SHARE*)1)
/**
Class is used as a BLOB field value storage for

2
sql/table_cache.cc
View File

@ -945,7 +945,7 @@ end:
table existed?
Let's return an invalid pointer here to catch dereferencing attempts.
*/
share= (TABLE_SHARE*) 1;
share= UNUSABLE_TABLE_SHARE;
}
DBUG_RETURN(share);