diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-12 06:22:35 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-12 06:22:35 -0700 |
| commit | 4678681895363ee9366ac1567d94458230020c16 (patch) | |
| tree | 148b8c692128d7dcdb3d773ae94f069f283fce24 /sql/sql_parse.cc | |
| parent | 2aab83ccdfc3626808882df4f08e2113f2d52f6d (diff) | |
| parent | f3ecad8cc99f0db0c891fe51d1099c7bc5273078 (diff) | |
| download | mariadb-git-4678681895363ee9366ac1567d94458230020c16.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a9a29904b60..cffdd19b08d 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1881,6 +1881,15 @@ mysql_execute_command(THD *thd) res = mysql_restore_table(thd, tables); break; } + case SQLCOM_PRELOAD_KEYS: + { + if (check_db_used(thd, tables) || + check_access(thd, INDEX_ACL, tables->db, &tables->grant.privilege)) + goto error; + res = mysql_preload_keys(thd, tables); + break; + } + #ifndef EMBEDDED_LIBRARY case SQLCOM_CHANGE_MASTER: @@ -4108,6 +4117,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, ptr->lock_type= lock_type; ptr->updating= test(table_options & TL_OPTION_UPDATING); ptr->force_index= test(table_options & TL_OPTION_FORCE_INDEX); + ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES); ptr->derived= table->sel; if (use_index) ptr->use_index=(List<String> *) thd->memdup((gptr) use_index, |