diff options
| author | unknown <monty@narttu.mysql.fi> | 2000-11-17 02:36:46 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2000-11-17 02:36:46 +0200 |
| commit | 8f906f7790ac9041c9ee09cc9ac072d983fdb777 (patch) | |
| tree | 09e51a2c4d96c3afa0d966f7469e46432fc6dc58 /mysys/thr_lock.c | |
| parent | 24137ef26120c29263acda059d79e7c21fe59319 (diff) | |
| download | mariadb-git-8f906f7790ac9041c9ee09cc9ac072d983fdb777.tar.gz | |
Fixes for bugs in the usage of IO_CACHE
Docs/manual.texi:
Fixed the TRUNCATE syntax + Changelog
include/my_sys.h:
Added my_b_vprintf
mysys/mf_iocache2.c:
Added my_b_vprintf
mysys/my_vsnprintf.c:
Fixed fatal (new) bug
mysys/thr_lock.c:
Cleanup
readline/bind.c:
cleanup
scripts/Makefile.am:
Added mysqldumpslow
sql-bench/crash-me.sh:
Fixed TRUNCATE
sql/log.cc:
bug fix
sql/log_event.cc:
Removed compiler warnings
sql/log_event.h:
Fixed non portable header in binary dump
sql/mf_iocache.cc:
cleanup
sql/mysqld.cc:
Fixed loop problem on NT
sql/slave.cc:
cleanup
sql/sql_class.cc:
Fixed typos
sql/sql_parse.cc:
cleanup
sql/sql_select.cc:
bugfix
sql/sql_table.cc:
cleanup
sql/sql_yacc.yy:
Changed ALTER TABLE ... ORDER BY to get fewer warnings
sql/unireg.cc:
cleanup
sql/unireg.h:
Added missing define
Diffstat (limited to 'mysys/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index df360447e69..b9a9d5274ee 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -422,8 +422,8 @@ int thr_lock(THR_LOCK_DATA *data,enum thr_lock_type lock_type) /* Request for READ lock */ if (lock->write.data) { - /* We can get allow a read lock even if there is already a write lock - one the table in one the following cases: + /* We can allow a read lock even if there is already a write lock + on the table in one the following cases: - This thread alread have a write lock on the table - The write lock is TL_WRITE_ALLOW_READ or TL_WRITE_DELAYED and the read lock is TL_READ_HIGH_PRIORITY or TL_READ |