1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius 2012-09-15 13:58:12 +03:00
commit cd9f773020
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TODO
View File

@ -15,6 +15,8 @@ Featured copied/merged
(Including support in all clients) (Including support in all clients)
- Added Ssl_server_not_before & Ssl_server_not_after variables - Added Ssl_server_not_before & Ssl_server_not_after variables
(Including changes to yassl) (Including changes to yassl)
- Added all mysql systems tables
- TRANSACTION READ ONLY | READ WRITE
Features recoded Features recoded
- Better error messages - Better error messages
@ -26,17 +28,17 @@ Fetures half done:
- Merge sql/rpl_mi.cc (To get Sys_ssl_crl & crlpath) - Merge sql/rpl_mi.cc (To get Sys_ssl_crl & crlpath)
Short time TODO: Short time TODO:
- Add support for TRANSACTION READ ONLY | READ WRITE in sql_yacc.yy - Add test cases for InnoDB
(support for variable tx_read_only)
- merge hostname.cc / hostname.h - merge hostname.cc / hostname.h
- add support for host_error() - add support for host_error()
- Enable performance_schema.host_cache in scripts/mysql_system_tables.sql - 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. - Add THD_STAGE_INFO everywhere.

3
storage/myisam/mi_create.c
View File

@ -473,7 +473,6 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
key_del[i]=HA_OFFSET_ERROR; key_del[i]=HA_OFFSET_ERROR;
unique_key_parts=0; unique_key_parts=0;
offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH;
for (i=0, uniquedef=uniquedefs ; i < uniques ; i++ , uniquedef++) for (i=0, uniquedef=uniquedefs ; i < uniques ; i++ , uniquedef++)
{ {
uniquedef->key=keys+i; uniquedef->key=keys+i;
@ -739,7 +738,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
#endif #endif
} }
/* Create extra keys for unique definitions */ /* 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_keydef,sizeof(tmp_keydef));
bzero((char*) &tmp_keyseg,sizeof(tmp_keyseg)); bzero((char*) &tmp_keyseg,sizeof(tmp_keyseg));
for (i=0; i < uniques ; i++) for (i=0; i < uniques ; i++)