diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-01 14:13:56 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-01 14:13:56 +0400 |
| commit | b9aa51e20995dc98f2739676499391cdcfbdec3d (patch) | |
| tree | 7ece657e9307accdb5790bd8d79052d284e8b061 /sql/sql_test.cc | |
| parent | 7c01868287e82ba22b76b5b9d007c6746bca3061 (diff) | |
| download | mariadb-git-b9aa51e20995dc98f2739676499391cdcfbdec3d.tar.gz | |
A follow up patch for the fix for Bug#51263 "Deadlock between
transactional SELECT and ALTER TABLE ... REBUILD PARTITION".
Remove unused code - TL_WRITE_ALLOW_READ thr_lock.c lock.
include/thr_lock.h:
Remove TL_WRITE_ALLOW_READ.
mysys/CMakeLists.txt:
Add thr_lock test to the list of CMake executables to build.
mysys/thr_lock.c:
Remove TL_WRITE_ALLOW_READ thr_lock.c lock.
Consequently, simplify lock compatibility rules.
Remove unused code.
sql/sql_test.cc:
Remove TL_WRITE_ALLOW_READ lock.
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index d34aee854d0..2f3ed0030cd 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -45,7 +45,6 @@ static const char *lock_descriptions[] = /* TL_READ_HIGH_PRIORITY */ "High priority read lock", /* TL_READ_NO_INSERT */ "Read lock without concurrent inserts", /* TL_WRITE_ALLOW_WRITE */ "Write lock that allows other writers", - /* TL_WRITE_ALLOW_READ */ "Write lock, but allow reading", /* TL_WRITE_CONCURRENT_INSERT */ "Concurrent insert lock", /* TL_WRITE_DELAYED */ "Lock used by delayed insert", /* TL_WRITE_DEFAULT */ NULL, |