diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2007-01-31 18:32:53 +0400 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2007-01-31 18:32:53 +0400 |
| commit | 8233b914ecc3cdc9cbec27aba4406c0ecd67cb58 (patch) | |
| tree | 9db59f5091ac5dcdaf3b78a7644b15d4444eb6ae | |
| parent | 3e35fffa909e82475dbac5a02bdb8bef26b1effe (diff) | |
| download | mariadb-git-8233b914ecc3cdc9cbec27aba4406c0ecd67cb58.tar.gz | |
After merge fix (WL#3567).
| -rw-r--r-- | sql/ha_myisam.cc | 3 | ||||
| -rw-r--r-- | sql/ha_myisammrg.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 18e621142f7..39f8894ae89 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -1728,12 +1728,13 @@ int ha_myisam::create(const char *name, register TABLE *table_arg, HA_CREATE_INFO *info) { int error; - uint create_flags= 0, options= table_arg->db_options_in_use, records; + uint create_flags= 0, records; char buff[FN_REFLEN]; MI_KEYDEF *keydef; MI_COLUMNDEF *recinfo; MI_CREATE_INFO create_info; TABLE_SHARE *share= table->s; + uint options= share->db_options_in_use; DBUG_ENTER("ha_myisam::create"); if ((error= table2myisam(table_arg, &keydef, &recinfo, &records))) DBUG_RETURN(error); /* purecov: inspected */ diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 97823e2cf47..8e24164abc9 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -97,7 +97,7 @@ int ha_myisammrg::open(const char *name, int mode, uint test_if_locked) MI_COLUMNDEF *recinfo; MYRG_TABLE *u_table; uint recs; - uint keys= table->keys; + uint keys= table->s->keys; int error; char name_buff[FN_REFLEN]; |