diff options
author | Michael Widenius <monty@mariadb.org> | 2014-09-08 20:56:56 +0300 |
---|---|---|
committer | Michael Widenius <monty@mariadb.org> | 2014-09-08 20:56:56 +0300 |
commit | 9c79227c961d91da4d1cbd0e96a05291874d6b9c (patch) | |
tree | 260c789b9b5f8097c6dc242a7ee6964b927598ae /mysql-test/valgrind.supp | |
parent | 0835f574891d0afdfe64229d38460128fedfdd38 (diff) | |
download | mariadb-git-9c79227c961d91da4d1cbd0e96a05291874d6b9c.tar.gz |
Fixed two bugs with CREATE OR REPLACE and LOCK TABLES:
MDEV-6560 Assertion `! is_set() ' failed in Diagnostics_area::set_ok_status on killing CREATE OR REPLACE
MDEV-6525 Assertion `table->pos_in_locked _tables == __null || table->pos_in_locked_tables->table = table' failed in mark_used_tables_as_free_for_reuse, locking problems and binlogging problems on CREATE OR REPLACE under lock.
mysql-test/r/create_or_replace.result:
Added test for MDEV-6560
mysql-test/t/create_or_replace.test:
Added test for MDEV-6560
mysql-test/valgrind.supp:
Added suppression for OpenSuse 12.3
sql/sql_base.cc:
More DBUG
sql/sql_class.cc:
Changed that thd_sqlcom_can_generate_row_events() does not report that CREATE OR REPLACE is generating row events.
This is safe as this function is only used by InnoDB/XtraDB to check if a query is generating row events as part of another transaction. As CREATE is always run as it's own transaction, this isn't a problem.
This fixed MDEV-6525.
sql/sql_table.cc:
Remember if reopen_tables() generates an error (which can only happen in case of KILL).
This fixed MDEV-6560
Diffstat (limited to 'mysql-test/valgrind.supp')
-rw-r--r-- | mysql-test/valgrind.supp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index f1bc19e27eb..ca190104d79 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -412,6 +412,17 @@ fun:__libc_start_main } +# +# dl_init reports leaked memory in memalign on OpenSuse 12.3 + +{ + memory "loss" from _dl_init + Memcheck:Leak + fun:memalign + ... + fun:call_init + fun:_dl_init +} # # dlclose can allocate memory for error message, the memory will be |