mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint BitKeeper/etc/collapsed: auto-union Makefile.am: Merged in changes from 5.0 mysql-test/r/range.result: Merged in changes from 5.0 mysys/default.c: Merged in changes from 5.0. Not reverting this change. scripts/mysql_create_system_tables.sh: Merged in changes from 5.0 scripts/mysqld_multi.sh: Merged in changes from 5.0. Not reverting this change. sql/item.cc: Merged in changes from 5.0 sql/mysql_priv.h: Merged in changes from 5.0 sql/set_var.h: Merged in changes from 5.0
This commit is contained in:
unknown
commit
a5f695ad30
3 changed files with 39 additions and 36 deletions
|
|
@ -34,3 +34,5 @@
|
|||
4562ba016dYH0JzszOqZ8p6psbKfnQ
|
||||
45771031yRCoM_ZfONdYchPvVEgLRg
|
||||
45ae6628gqKTsUFfnoNExadETVIkbA
|
||||
45ba4faf2oqu6eR8fqecR3LfSNcYUg
|
||||
45ba5238-NKl80QVXzdGo8hO9M75Xg
|
||||
|
|
|
|||
|
|
@ -307,54 +307,55 @@ MY_LOCALE *my_locale_by_number(uint number);
|
|||
TODO: separate three contexts above, move them to separate bitfields.
|
||||
*/
|
||||
|
||||
#define SELECT_DISTINCT (ULL(1) << 0) // SELECT, user
|
||||
#define SELECT_STRAIGHT_JOIN (ULL(1) << 1) // SELECT, user
|
||||
#define SELECT_DESCRIBE (ULL(1) << 2) // SELECT, user
|
||||
#define SELECT_SMALL_RESULT (ULL(1) << 3) // SELECT, user
|
||||
#define SELECT_BIG_RESULT (ULL(1) << 4) // SELECT, user
|
||||
#define OPTION_FOUND_ROWS (ULL(1) << 5) // SELECT, user
|
||||
#define OPTION_TO_QUERY_CACHE (ULL(1) << 6) // SELECT, user
|
||||
#define SELECT_NO_JOIN_CACHE (ULL(1) << 7) // intern
|
||||
#define OPTION_BIG_TABLES (ULL(1) << 8) // THD, user
|
||||
#define OPTION_BIG_SELECTS (ULL(1) << 9) // THD, user
|
||||
#define OPTION_LOG_OFF (ULL(1) << 10) // THD, user
|
||||
#define OPTION_QUOTE_SHOW_CREATE (ULL(1) << 11) // THD, user
|
||||
#define TMP_TABLE_ALL_COLUMNS (ULL(1) << 12) // SELECT, intern
|
||||
#define OPTION_WARNINGS (ULL(1) << 13) // THD, user
|
||||
#define OPTION_AUTO_IS_NULL (ULL(1) << 14) // THD, user, binlog
|
||||
#define OPTION_FOUND_COMMENT (ULL(1) << 15) // SELECT, intern, parser
|
||||
#define OPTION_SAFE_UPDATES (ULL(1) << 16) // THD, user
|
||||
#define OPTION_BUFFER_RESULT (ULL(1) << 17) // SELECT, user
|
||||
#define OPTION_BIN_LOG (ULL(1) << 18) // THD, user
|
||||
#define OPTION_NOT_AUTOCOMMIT (ULL(1) << 19) // THD, user
|
||||
#define OPTION_BEGIN (ULL(1) << 20) // THD, intern
|
||||
#define OPTION_TABLE_LOCK (ULL(1) << 21) // THD, intern
|
||||
#define OPTION_QUICK (ULL(1) << 22) // SELECT (for DELETE)
|
||||
#define OPTION_KEEP_LOG (ULL(1) << 23) // Keep binlog on rollback
|
||||
#define SELECT_DISTINCT (1ULL << 0) // SELECT, user
|
||||
#define SELECT_STRAIGHT_JOIN (1ULL << 1) // SELECT, user
|
||||
#define SELECT_DESCRIBE (1ULL << 2) // SELECT, user
|
||||
#define SELECT_SMALL_RESULT (1ULL << 3) // SELECT, user
|
||||
#define SELECT_BIG_RESULT (1ULL << 4) // SELECT, user
|
||||
#define OPTION_FOUND_ROWS (1ULL << 5) // SELECT, user
|
||||
#define OPTION_TO_QUERY_CACHE (1ULL << 6) // SELECT, user
|
||||
#define SELECT_NO_JOIN_CACHE (1ULL << 7) // intern
|
||||
#define OPTION_BIG_TABLES (1ULL << 8) // THD, user
|
||||
#define OPTION_BIG_SELECTS (1ULL << 9) // THD, user
|
||||
#define OPTION_LOG_OFF (1ULL << 10) // THD, user
|
||||
#define OPTION_QUOTE_SHOW_CREATE (1ULL << 11) // THD, user, unused
|
||||
#define TMP_TABLE_ALL_COLUMNS (1ULL << 12) // SELECT, intern
|
||||
#define OPTION_WARNINGS (1ULL << 13) // THD, user
|
||||
#define OPTION_AUTO_IS_NULL (1ULL << 14) // THD, user, binlog
|
||||
#define OPTION_FOUND_COMMENT (1ULL << 15) // SELECT, intern, parser
|
||||
#define OPTION_SAFE_UPDATES (1ULL << 16) // THD, user
|
||||
#define OPTION_BUFFER_RESULT (1ULL << 17) // SELECT, user
|
||||
#define OPTION_BIN_LOG (1ULL << 18) // THD, user
|
||||
#define OPTION_NOT_AUTOCOMMIT (1ULL << 19) // THD, user
|
||||
#define OPTION_BEGIN (1ULL << 20) // THD, intern
|
||||
#define OPTION_TABLE_LOCK (1ULL << 21) // THD, intern
|
||||
#define OPTION_QUICK (1ULL << 22) // SELECT (for DELETE)
|
||||
#define OPTION_KEEP_LOG (1ULL << 23) // THD, user
|
||||
|
||||
/* The following is used to detect a conflict with DISTINCT */
|
||||
#define SELECT_ALL (ULL(1) << 24) // SELECT, user, parser
|
||||
#define SELECT_ALL (1ULL << 24) // SELECT, user, parser
|
||||
|
||||
/* Set if we are updating a non-transaction safe table */
|
||||
#define OPTION_STATUS_NO_TRANS_UPDATE (ULL(1) << 25) // THD, intern
|
||||
#define OPTION_STATUS_NO_TRANS_UPDATE (1ULL << 25) // THD, intern
|
||||
|
||||
/* The following can be set when importing tables in a 'wrong order'
|
||||
to suppress foreign key checks */
|
||||
#define OPTION_NO_FOREIGN_KEY_CHECKS (ULL(1) << 26) // THD, user, binlog
|
||||
#define OPTION_NO_FOREIGN_KEY_CHECKS (1ULL << 26) // THD, user, binlog
|
||||
/* The following speeds up inserts to InnoDB tables by suppressing unique
|
||||
key checks in some cases */
|
||||
#define OPTION_RELAXED_UNIQUE_CHECKS (ULL(1) << 27) // THD, user, binlog
|
||||
#define SELECT_NO_UNLOCK (ULL(1) << 28) // SELECT, intern
|
||||
#define OPTION_SCHEMA_TABLE (ULL(1) << 29) // SELECT, intern
|
||||
#define OPTION_RELAXED_UNIQUE_CHECKS (1ULL << 27) // THD, user, binlog
|
||||
#define SELECT_NO_UNLOCK (1ULL << 28) // SELECT, intern
|
||||
#define OPTION_SCHEMA_TABLE (1ULL << 29) // SELECT, intern
|
||||
/* Flag set if setup_tables already done */
|
||||
#define OPTION_SETUP_TABLES_DONE (ULL(1) << 30) // intern
|
||||
#define OPTION_SETUP_TABLES_DONE (1ULL << 30) // intern
|
||||
/* If not set then the thread will ignore all warnings with level notes. */
|
||||
#define OPTION_SQL_NOTES (ULL(1) << 31) // THD, user
|
||||
/*
|
||||
#define OPTION_SQL_NOTES (1ULL << 31) // THD, user
|
||||
/*
|
||||
Force the used temporary table to be a MyISAM table (because we will use
|
||||
fulltext functions when reading from it.
|
||||
*/
|
||||
#define TMP_TABLE_FORCE_MYISAM (ULL(1) << 32)
|
||||
#define TMP_TABLE_FORCE_MYISAM (1ULL << 32)
|
||||
|
||||
|
||||
/*
|
||||
Maximum length of time zone name that we support
|
||||
|
|
|
|||
|
|
@ -478,11 +478,11 @@ class sys_var_thd_bit :public sys_var_thd
|
|||
sys_check_func check_func;
|
||||
sys_update_func update_func;
|
||||
public:
|
||||
ulong bit_flag;
|
||||
ulonglong bit_flag;
|
||||
bool reverse;
|
||||
sys_var_thd_bit(const char *name_arg,
|
||||
sys_check_func c_func, sys_update_func u_func,
|
||||
ulong bit, bool reverse_arg=0)
|
||||
ulonglong bit, bool reverse_arg=0)
|
||||
:sys_var_thd(name_arg), check_func(c_func), update_func(u_func),
|
||||
bit_flag(bit), reverse(reverse_arg)
|
||||
{}
|
||||
|
|
|
|||
Loading…
Reference in a new issue