diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-08-25 17:12:44 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-08-25 17:12:44 +0200 |
| commit | 1459b65cf72b0bc92e51882035b0bcca9d3ebb9c (patch) | |
| tree | 3a97bfb7300fcaf44809303f48f025c84e979982 /storage | |
| parent | 8b72c02a2578448a9ac0a16042a6bc142d9d81bb (diff) | |
| download | mariadb-git-1459b65cf72b0bc92e51882035b0bcca9d3ebb9c.tar.gz | |
Applying fix from Oracle (Marko) for Bug #46657 "InnoDB plugin: invalid read in index_merge_innodb test (Valgrind)"
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index d1f64a1985c..5075b841879 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -863,6 +863,7 @@ error_handling: indexed_table->n_mysql_handles_opened++; error = row_merge_drop_table(trx, innodb_table); + innodb_table = indexed_table; goto convert_error; case DB_TOO_BIG_RECORD: |