diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-13 15:50:30 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-13 15:50:30 +0300 |
| commit | 3974119b5f1a735d4087105eb8c07f241a70f64b (patch) | |
| tree | 9b5d0d5098c97ae49c22be860572ba78e7471faa /sql/opt_range.h | |
| parent | 0cdddbf144de80d1c4da00ee681632bc0ac6c7c9 (diff) | |
| parent | 74ea459412f9a479ea1385a72cc27b4245c06435 (diff) | |
| download | mariadb-git-3974119b5f1a735d4087105eb8c07f241a70f64b.tar.gz | |
merge with 4.0 for more memory allocation variables.
configure.in:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
scripts/Makefile.am:
merge
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
sql/set_var.cc:
merge
sql/sql_class.h:
merge
sql/sql_delete.cc:
merge
sql/sql_parse.cc:
merge
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 00736bfc22f..4c1aba7b829 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -83,7 +83,7 @@ public: ha_rows records; double read_time; - QUICK_SELECT(TABLE *table,uint index_arg,bool no_alloc=0); + QUICK_SELECT(THD *thd, TABLE *table,uint index_arg,bool no_alloc=0); virtual ~QUICK_SELECT(); void reset(void) { next=0; it.rewind(); } int init() { return error=file->index_init(index); } @@ -127,13 +127,15 @@ class SQL_SELECT :public Sql_alloc { SQL_SELECT(); ~SQL_SELECT(); - bool check_quick(bool force_quick_range=0, ha_rows limit = HA_POS_ERROR) - { return test_quick_select(~0L,0,limit, force_quick_range) < 0; } + bool check_quick(THD *thd, bool force_quick_range= 0, + ha_rows limit= HA_POS_ERROR) + { return test_quick_select(thd, ~0L,0,limit, force_quick_range) < 0; } inline bool skipp_record() { return cond ? cond->val_int() == 0 : 0; } - int test_quick_select(key_map keys,table_map prev_tables,ha_rows limit, - bool force_quick_range=0); + int test_quick_select(THD *thd, key_map keys, table_map prev_tables, + ha_rows limit, bool force_quick_range=0); }; -QUICK_SELECT *get_quick_select_for_ref(TABLE *table, struct st_table_ref *ref); +QUICK_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, + struct st_table_ref *ref); #endif |