Merge lp:~akopytov/percona-server/bug901775-5.1 into lp:percona-server/5.1

Proposed by Alexey Kopytov
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 412
Merged at revision: 413
Proposed branch: lp:~akopytov/percona-server/bug901775-5.1
Merge into: lp:percona-server/5.1
Diff against target: 90 lines (+19/-5)
4 files modified
Percona-Server/storage/innodb_plugin/dict/dict0load.c (+2/-2)
Percona-Server/storage/innodb_plugin/fil/fil0fil.c (+12/-1)
Percona-Server/storage/innodb_plugin/include/fil0fil.h (+4/-1)
Percona-Server/storage/innodb_plugin/row/row0mysql.c (+1/-1)
To merge this branch: bzr merge lp:~akopytov/percona-server/bug901775-5.1
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+86991@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Was approved previously. Had to recreate the branch to fix a stacked branch problem, so the previous MP is gone.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/storage/innodb_plugin/dict/dict0load.c'
--- Percona-Server/storage/innodb_plugin/dict/dict0load.c 2011-11-24 02:00:40 +0000
+++ Percona-Server/storage/innodb_plugin/dict/dict0load.c 2011-12-28 08:15:30 +0000
@@ -430,7 +430,7 @@
430 object and check that the .ibd file exists. */430 object and check that the .ibd file exists. */
431431
432 fil_open_single_table_tablespace(FALSE, space_id,432 fil_open_single_table_tablespace(FALSE, space_id,
433 flags, name);433 flags, name, NULL);
434 }434 }
435435
436 mem_free(name);436 mem_free(name);
@@ -1023,7 +1023,7 @@
1023 if (!fil_open_single_table_tablespace(1023 if (!fil_open_single_table_tablespace(
1024 TRUE, space,1024 TRUE, space,
1025 flags == DICT_TF_COMPACT ? 0 :1025 flags == DICT_TF_COMPACT ? 0 :
1026 flags & ~(~0 << DICT_TF_BITS), name)) {1026 flags & ~(~0 << DICT_TF_BITS), name, NULL)) {
1027 /* We failed to find a sensible1027 /* We failed to find a sensible
1028 tablespace file */1028 tablespace file */
10291029
10301030
=== modified file 'Percona-Server/storage/innodb_plugin/fil/fil0fil.c'
--- Percona-Server/storage/innodb_plugin/fil/fil0fil.c 2011-11-24 02:00:47 +0000
+++ Percona-Server/storage/innodb_plugin/fil/fil0fil.c 2011-12-28 08:15:30 +0000
@@ -3124,8 +3124,11 @@
3124 accessing the first page of the file */3124 accessing the first page of the file */
3125 ulint id, /*!< in: space id */3125 ulint id, /*!< in: space id */
3126 ulint flags, /*!< in: tablespace flags */3126 ulint flags, /*!< in: tablespace flags */
3127 const char* name) /*!< in: table name in the3127 const char* name, /*!< in: table name in the
3128 databasename/tablename format */3128 databasename/tablename format */
3129 trx_t* trx) /*!< in: transaction. This is only used
3130 for IMPORT TABLESPACE, must be NULL
3131 otherwise */
3129{3132{
3130 os_file_t file;3133 os_file_t file;
3131 char* filepath;3134 char* filepath;
@@ -3342,6 +3345,11 @@
3342 /* over write space id of all pages */3345 /* over write space id of all pages */
3343 rec_offs_init(offsets_);3346 rec_offs_init(offsets_);
33443347
3348 /* Unlock the data dictionary to not block queries
3349 accessing other tables */
3350 ut_a(trx);
3351 row_mysql_unlock_data_dictionary(trx);
3352
3345 fprintf(stderr, "InnoDB: Progress in %%:");3353 fprintf(stderr, "InnoDB: Progress in %%:");
33463354
3347 for (offset = 0; offset < free_limit_bytes;3355 for (offset = 0; offset < free_limit_bytes;
@@ -3543,6 +3551,9 @@
35433551
3544 fprintf(stderr, " done.\n");3552 fprintf(stderr, " done.\n");
35453553
3554 /* Reacquire the data dictionary lock */
3555 row_mysql_lock_data_dictionary(trx);
3556
3546 /* update SYS_INDEXES set root page */3557 /* update SYS_INDEXES set root page */
3547 index = dict_table_get_first_index(table);3558 index = dict_table_get_first_index(table);
3548 while (index) {3559 while (index) {
35493560
=== modified file 'Percona-Server/storage/innodb_plugin/include/fil0fil.h'
--- Percona-Server/storage/innodb_plugin/include/fil0fil.h 2011-11-24 02:00:41 +0000
+++ Percona-Server/storage/innodb_plugin/include/fil0fil.h 2011-12-28 08:15:30 +0000
@@ -473,8 +473,11 @@
473 accessing the first page of the file */473 accessing the first page of the file */
474 ulint id, /*!< in: space id */474 ulint id, /*!< in: space id */
475 ulint flags, /*!< in: tablespace flags */475 ulint flags, /*!< in: tablespace flags */
476 const char* name); /*!< in: table name in the476 const char* name, /*!< in: table name in the
477 databasename/tablename format */477 databasename/tablename format */
478 trx_t* trx); /*!< in: transaction. This is only
479 used for IMPORT TABLESPACE, must be NULL
480 otherwise */
478/********************************************************************//**481/********************************************************************//**
479It is possible, though very improbable, that the lsn's in the tablespace to be482It is possible, though very improbable, that the lsn's in the tablespace to be
480imported have risen above the current system lsn, if a lengthy purge, ibuf483imported have risen above the current system lsn, if a lengthy purge, ibuf
481484
=== modified file 'Percona-Server/storage/innodb_plugin/row/row0mysql.c'
--- Percona-Server/storage/innodb_plugin/row/row0mysql.c 2011-11-24 16:33:30 +0000
+++ Percona-Server/storage/innodb_plugin/row/row0mysql.c 2011-12-28 08:15:30 +0000
@@ -2708,7 +2708,7 @@
2708 success = fil_open_single_table_tablespace(2708 success = fil_open_single_table_tablespace(
2709 TRUE, table->space,2709 TRUE, table->space,
2710 table->flags == DICT_TF_COMPACT ? 0 : table->flags,2710 table->flags == DICT_TF_COMPACT ? 0 : table->flags,
2711 table->name);2711 table->name, trx);
2712 if (success) {2712 if (success) {
2713 table->ibd_file_missing = FALSE;2713 table->ibd_file_missing = FALSE;
2714 table->tablespace_discarded = FALSE;2714 table->tablespace_discarded = FALSE;

Subscribers

People subscribed via source and target branches