diff options
author | unknown <monty@mashka.mysql.fi> | 2002-12-20 14:58:27 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-12-20 14:58:27 +0200 |
commit | 791e9fb37ea10f3e91e56e15c869906d90313c06 (patch) | |
tree | 1cf172e757bfa6aca7ae5af20ed7b0c727016120 /sql/item_func.h | |
parent | 172d5acb6d2fc29517a70e069ae89ea67951555c (diff) | |
download | mariadb-git-791e9fb37ea10f3e91e56e15c869906d90313c06.tar.gz |
Changed thd variables max_join_size and select_limit to type ha_rows.
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
Docs/mysqld_error.txt:
Added new error message
acinclude.m4:
Fix for configure problem on OpenUnix
configure.in:
Fix for OpenUnix
Added C and C++ versions to mysqlbug
mysql-test/r/variables.result:
Update of max_join_size handling
mysql-test/t/variables.test:
Update of max_join_size handling
mysys/Makefile.am:
Removed duplicate row
mysys/my_alloc.c:
Safety fixes (not fatal)
scripts/Makefile.am:
Added C and C++ compiler versions to mysqlbug
scripts/mysqlbug.sh:
Added C and C++ compiler versions to mysqlbug
sql/item_func.cc:
Fixed that user variables that changes are not threated as constants.
sql/item_func.h:
Fixed that user variables that changes are not threated as constants.
sql/mysqld.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/repl_failsafe.cc:
Removed not needed cast
sql/set_var.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/set_var.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/slave.cc:
Removed not needed cast
sql/sql_class.h:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/sql_parse.cc:
Removed not needed cast
Fixed security problem with mysql_drop_db()
sql/sql_show.cc:
Changed thd variables max_join_size and select_limit to type ha_rows
sql/structs.h:
Changed thd variables max_join_size and select_limit to type ha_rows
Diffstat (limited to 'sql/item_func.h')
-rw-r--r-- | sql/item_func.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 501dcdadc3f..31310ab564e 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -902,11 +902,10 @@ class Item_func_get_user_var :public Item_func { LEX_STRING name; user_var_entry *var_entry; - bool const_var_flag; public: Item_func_get_user_var(LEX_STRING a): - Item_func(), name(a), const_var_flag(1) {} + Item_func(), name(a) {} user_var_entry *get_entry(); double val(); longlong val_int(); @@ -915,9 +914,9 @@ public: void print(String *str); enum Item_result result_type() const; const char *func_name() const { return "get_user_var"; } - bool const_item() const { return const_var_flag; } + bool const_item() const; table_map used_tables() const - { return const_var_flag ? 0 : RAND_TABLE_BIT; } + { return const_item() ? 0 : RAND_TABLE_BIT; } bool eq(const Item *item, bool binary_cmp) const; unsigned int size_of() { return sizeof(*this);} }; |