diff options
| author | unknown <guilhem@gbichot3.local> | 2006-08-09 15:27:38 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-08-09 15:27:38 +0200 |
| commit | 381fdf1a67a67a7e9037bbbf385cb67cbaef126e (patch) | |
| tree | 31c3b9a054da191751085442fae03a12739e3b4c /sql/mysql_priv.h | |
| parent | b6897efbb8b7119e4abd28bed93a3579c2bf914e (diff) | |
| parent | e6efa27c0b720702f3841a4d28e795c49432bfc5 (diff) | |
| download | mariadb-git-381fdf1a67a67a7e9037bbbf385cb67cbaef126e.tar.gz | |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-2
into gbichot3.local:/home/mysql_src/mysql-maria; I'll fix manually.
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
include/Makefile.am:
Auto merged
include/my_base.h:
Auto merged
include/myisam.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.h:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/ft_nlq_search.c:
Auto merged
storage/myisam/ft_parser.c:
Auto merged
storage/myisam/ft_static.c:
Auto merged
storage/myisam/ft_update.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/rt_index.c:
Auto merged
storage/myisam/sort.c:
Auto merged
include/my_handler.h:
these ones I'll remove right away
mysys/my_handler.c:
merge
sql/mysql_priv.h:
merge
sql/set_var.cc:
merge
storage/csv/ha_tina.cc:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a9ecbb23a27..c423259476c 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1673,6 +1673,13 @@ extern handlerton myisammrg_hton; /* MRG_MYISAM handler is always built, but may be skipped */ #define have_merge_db myisammrg_hton.state +#ifdef WITH_MARIA_STORAGE_ENGINE +extern handlerton maria_hton; +#define have_maria maria_hton.state +#else +extern SHOW_COMP_OPTION have_maria; +#endif + extern handlerton myisam_hton; extern handlerton myisammrg_hton; extern handlerton heap_hton; |