diff options
author | unknown <monty@mysql.com> | 2006-05-04 01:58:21 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2006-05-04 01:58:21 +0300 |
commit | 26fe4bf90b1a5ad3056a095e7950e0965af3eb5c (patch) | |
tree | 601f395a558a2ae6d4a2426950ca9c73b6b4788d /sql/handler.cc | |
parent | 462a43e16b5bb2307effe44d18cdb82fef1ff170 (diff) | |
parent | 3c099551d09b2e2a5a19b0428226d32bd5fe68d7 (diff) | |
download | mariadb-git-26fe4bf90b1a5ad3056a095e7950e0965af3eb5c.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/my/mysql-5.1
mysql-test/t/mysqldump.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_table.cc:
After merge fix
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index bf84ec16ea8..483bf049177 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -51,6 +51,8 @@ static handlerton *installed_htons[128]; #define BITMAP_STACKBUF_SIZE (128/8) +KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NullS,0} }; + /* static functions defined in this file */ static handler *create_default(TABLE_SHARE *table); |