diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-04 13:19:18 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-04 13:19:18 +0300 |
| commit | 7b4bd6dfce0068d65adfbefc5d5dc887bc887c73 (patch) | |
| tree | 2bd920faed338115c883153aacd1f6323e067b34 /storage/xtradb | |
| parent | 60ddf6f2b70f8349e9cac9bab2ad62217cd957be (diff) | |
| download | mariadb-git-7b4bd6dfce0068d65adfbefc5d5dc887bc887c73.tar.gz | |
Fixed some test failures after last push (failing tests and valgrind warnings)
Added --strace support to mysql-test-run
mysql-test/mysql-test-run.pl:
Added support for --strace (usefull for example to check how much memory mysqld was using)
mysql-test/suite/funcs_1/t/is_engines_innodb.test:
Fixed test case to also work with xtradb
mysql-test/suite/innodb_plugin/t/innodb.test:
Don't run if we don't have the used character sets.
mysql-test/suite/innodb_plugin/t/innodb_mysql.test:
Don't run if we don't have the used character sets.
sql/sql_show.cc:
Extended comment to 160 characters to get full comment from xtradb
storage/xtradb/handler/ha_innodb.cc:
Fixed valgrind warning.
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index ce89d4ef57c..cbac193a0cc 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -3502,7 +3502,7 @@ retry: sql_print_error("Table %s has a primary key in InnoDB data " "dictionary, but not in MySQL!", name); } - + prebuilt->clust_index_was_generated = FALSE; /* MySQL allocates the buffer for ref. key_info->key_length @@ -3511,7 +3511,8 @@ retry: save space, because all row reference buffers are allocated based on ref_length. */ - ref_length = table->key_info[primary_key].key_length; + if (primary_key < MAX_KEY) + ref_length = table->key_info[primary_key].key_length; } else { if (primary_key != MAX_KEY) { sql_print_error("Table %s has no primary key in InnoDB data " |