database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
This commit is contained in:
dlenev@mockturtle.local
2006-10-02 21:41:35 +04:00
parent 9402038287 8a5fef1419
commit 0868629129
76 changed files with 1578 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/mysql_priv.h
View File

@ -458,7 +458,8 @@ enum enum_parsing_place
NO_MATTER,
IN_HAVING,
SELECT_LIST,
IN_WHERE
IN_WHERE,
IN_ON
};
struct st_table;
@ -1637,19 +1638,7 @@ extern SHOW_COMP_OPTION have_ndbcluster;
extern SHOW_COMP_OPTION have_partition_db;
extern SHOW_COMP_OPTION have_merge_db;
#ifdef WITH_CSV_STORAGE_ENGINE
extern handlerton *tina_hton;
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
extern handlerton *ndbcluster_hton;
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
extern handlerton *partition_hton;
#endif
#ifdef WITH_MYISAMMRG_STORAGE_ENGINE
extern handlerton *myisammrg_hton;
#endif
extern handlerton *myisam_hton;
extern handlerton *heap_hton;