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_base.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_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 1ef4e9df020..37bf94800d7 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -35,8 +35,6 @@ static int open_unireg_entry(THD *thd,TABLE *entry,const char *db, const char *name, const char *alias); static void free_cache_entry(TABLE *entry); static void mysql_rm_tmp_tables(void); -static key_map get_key_map_from_key_list(TABLE *table, - List<String> *index_list); extern "C" byte *table_cache_key(const byte *record,uint *length, @@ -2066,8 +2064,8 @@ bool setup_tables(TABLE_LIST *tables) } -static key_map get_key_map_from_key_list(TABLE *table, - List<String> *index_list) +key_map get_key_map_from_key_list(TABLE *table, + List<String> *index_list) { key_map map=0; List_iterator_fast<String> it(*index_list); |