Merge lp://staging/~sergei.glushchenko/mysql-server/56-expand_fast_index_creation into lp://staging/mysql-server/5.6
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~sergei.glushchenko/mysql-server/56-expand_fast_index_creation |
| Merge into: | lp://staging/mysql-server/5.6 |
| Diff against target: |
1860 lines (+1471/-2) (has conflicts) 22 files modified
client/client_priv.h (+1/-0) client/mysqldump.c (+325/-0) mysql-test/r/mysqld--help-notwin.result (+5/-0) mysql-test/r/mysqld--help-win.result (+5/-0) mysql-test/r/percona_expand_fast_index_creation.result (+76/-0) mysql-test/r/percona_mysqldump_innodb_optimize_keys.result (+443/-0) mysql-test/suite/innodb/r/percona_bug_999147.result (+17/-0) mysql-test/suite/innodb/t/percona_bug_999147-master.opt (+1/-0) mysql-test/suite/innodb/t/percona_bug_999147.test (+29/-0) mysql-test/suite/sys_vars/r/expand_fast_index_creation_basic.result (+6/-0) mysql-test/suite/sys_vars/t/expand_fast_index_creation_basic.test (+2/-0) mysql-test/t/percona_expand_fast_index_creation.test (+70/-0) mysql-test/t/percona_mysqldump_innodb_optimize_keys.test (+227/-0) sql/handler.cc (+4/-2) sql/sql_alter.cc (+4/-0) sql/sql_alter.h (+6/-0) sql/sql_class.h (+1/-0) sql/sql_table.cc (+215/-0) sql/sys_vars.cc (+8/-0) storage/innobase/handler/ha_innodb.cc (+14/-0) storage/innobase/handler/handler0alter.cc (+2/-0) storage/innobase/include/ha_prototypes.h (+10/-0) Text conflict in client/mysqldump.c |
| To merge this branch: | bzr merge lp://staging/~sergei.glushchenko/mysql-server/56-expand_fast_index_creation |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexey Kopytov | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 3931. By Sergei Glushchenko
-
Stronger assertion. Check that mdl_ticket == 0 only for temporary table
- 3930. By Sergei Glushchenko
-
Coding guidelines and proper error handling.
- 3929. By Sergei Glushchenko
-
Added comment for change in ha_commit_
inplace_ alter_table - 3928. By Sergei Glushchenko
-
error is not used variable
- 3927. By Sergei Glushchenko
-
Test case improved.
Drop and create keys on temporary table is performed as following.
Create Alter_info which describe table changes. As fields of the
table not changed, populate clreate_list with field definitions
using field==orig_field. Create Alter_inplace_info describing
alter operations to be performed. Fill index_drop_buffer or
index_add_buffer respectively. Set ADD_INDEX/DROP_INDEX handler flag.
Check that operation could be performed online by calling
check_if_supported_ inplace_ alter. Perform alter operation by calling
ha_prepare_inplace_ alter_table, ha_inplace_ alter_table,
ha_commit_inplace_ alter_table. - 3926. By Sergei Glushchenko
-
fix for bugs #1039536, #1081003 been merged
- 3925. By Sergei Glushchenko
-
fix 'C' linkage
- 3924. By Sergei Glushchenko
-
Testcase added
- 3923. By Sergei Glushchenko
-
some more cleanup
- 3922. By Sergei Glushchenko
-
Workaround for locking
