diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-31 23:52:08 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-31 23:52:08 +0300 |
| commit | d13b5812b837d78ccfda494f2bc05ba460435f3b (patch) | |
| tree | c7f4f73109950d10141f2ff28da2be6a13f9db8e | |
| parent | f277f27ae2fb4ab45a014027f08093a28acc1c14 (diff) | |
| download | mariadb-git-d13b5812b837d78ccfda494f2bc05ba460435f3b.tar.gz | |
Updated TODO
Next step of merge
storage/myisam/mi_create.c:
Merge from 5.6
| -rw-r--r-- | TODO | 12 | ||||
| -rw-r--r-- | storage/myisam/mi_create.c | 3 |
2 files changed, 8 insertions, 7 deletions
@@ -15,6 +15,8 @@ Featured copied/merged (Including support in all clients) - Added Ssl_server_not_before & Ssl_server_not_after variables (Including changes to yassl) +- Added all mysql systems tables +- TRANSACTION READ ONLY | READ WRITE Features recoded - Better error messages @@ -26,17 +28,17 @@ Fetures half done: - Merge sql/rpl_mi.cc (To get Sys_ssl_crl & crlpath) Short time TODO: -- Add support for TRANSACTION READ ONLY | READ WRITE in sql_yacc.yy - (support for variable tx_read_only) +- Add test cases for InnoDB - merge hostname.cc / hostname.h - add support for host_error() - - Enable performance_schema.host_cache in scripts/mysql_system_tables.sql -- Add full support for timestamp. (remove timestamp handling from ha_write()) +- Add full support for automatic timestamp. + (remove timestamp handling from ha_write()) + - Timour is working on this -- Add Sys_my_bind_addr(); Needed for perfschema +- Add Sys_my_bind_addr(); Needed for perfschema - Add THD_STAGE_INFO everywhere. diff --git a/storage/myisam/mi_create.c b/storage/myisam/mi_create.c index d4cc31368dd..ad97fba2cbb 100644 --- a/storage/myisam/mi_create.c +++ b/storage/myisam/mi_create.c @@ -473,7 +473,6 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, key_del[i]=HA_OFFSET_ERROR; unique_key_parts=0; - offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH; for (i=0, uniquedef=uniquedefs ; i < uniques ; i++ , uniquedef++) { uniquedef->key=keys+i; @@ -739,7 +738,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, #endif } /* Create extra keys for unique definitions */ - offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH; + offset= real_reclength - uniques * MI_UNIQUE_HASH_LENGTH; bzero((char*) &tmp_keydef,sizeof(tmp_keydef)); bzero((char*) &tmp_keyseg,sizeof(tmp_keyseg)); for (i=0; i < uniques ; i++) |