diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-02-06 16:14:09 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-02-06 16:14:09 +0200 |
| commit | 313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe (patch) | |
| tree | 6427fe4c05a8fa7025db373ba8e684b0286ce3c1 /plugin/metadata_lock_info | |
| parent | 1695fc45326434806ea747dd63fee4481e545493 (diff) | |
| download | mariadb-git-313f18be5a4b9c56d9c7331227f72e3f2fa4f9fe.tar.gz | |
Fixed errors and warnings found by buildbot
mysql-test/r/lowercase_table2.result:
Updated result
(The change happend because we don't try to open the table anymore as part of create table)
mysql-test/suite/rpl/r/create_or_replace_mix.result:
Fixed result file
mysql-test/suite/rpl/r/create_or_replace_row.result:
Fixed result file
mysql-test/suite/rpl/r/create_or_replace_statement.result:
Fixed result file
mysql-test/suite/rpl/t/create_or_replace.inc:
Drop open temporary table
mysys/my_delete.c:
Added missing newline
plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result:
Fixed result
(Lock names was before off by one. Was corrected by my previous patch)
sql/sql_select.cc:
Fixed compiler warnings by adding missing casts
storage/connect/ha_connect.cc:
Fixed compiler warnings
storage/innobase/os/os0file.cc:
Fixed compiler warnings
storage/xtradb/btr/btr0btr.cc:
Fixed compiler warnings
storage/xtradb/handler/ha_innodb.cc:
removed not used function
strings/ctype-uca.c:
Fixed compiler warnings
support-files/compiler_warnings.supp:
Added suppression for warnings that are wrong or are not serious andthat we don't plan to fix.
Diffstat (limited to 'plugin/metadata_lock_info')
| -rw-r--r-- | plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result index 9e3779e0336..e1d690b566c 100644 --- a/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result +++ b/plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result @@ -5,7 +5,7 @@ GET_LOCK('LOCK1',0) 1 SELECT lock_mode, lock_duration, lock_type, table_schema, table_name FROM information_schema.metadata_lock_info; lock_mode lock_duration lock_type table_schema table_name -MDL_SHARED_NO_READ_WRITE MDL_EXPLICIT User lock LOCK1 +MDL_SHARED_NO_WRITE MDL_EXPLICIT User lock LOCK1 SELECT RELEASE_LOCK('LOCK1'); RELEASE_LOCK('LOCK1') 1 |