summaryrefslogtreecommitdiff
path: root/include/thr_lock.h
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-02-28 13:29:48 +0200
committerunknown <monty@narttu.mysql.fi>2003-02-28 13:29:48 +0200
commit21a32d758e9f6bf9e0fb2fca6548c1e37ad1af60 (patch)
treee05b50b2e283ecdeb7b689c60ce89560e6825552 /include/thr_lock.h
parent352beccce6144db231222f32a38595798f77fbe1 (diff)
parent654878ac74ade2fb7e0017d0c27300acada7c3d3 (diff)
downloadmariadb-git-21a32d758e9f6bf9e0fb2fca6548c1e37ad1af60.tar.gz
Merge with 3.23 -> 4.0
configure.in: Auto merged include/config-win.h: Auto merged include/thr_lock.h: Auto merged mysql-test/Makefile.am: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_show.cc: Auto merged sql/log_event.cc: merge sql/mysqld.cc: merge
Diffstat (limited to 'include/thr_lock.h')
-rw-r--r--include/thr_lock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/thr_lock.h b/include/thr_lock.h
index cf5b0cce4bc..cf59f4aaeb2 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -43,8 +43,8 @@ enum thr_lock_type { TL_IGNORE=-1,
*/
TL_WRITE_ALLOW_WRITE,
/*
- Write lock, but allow other threads to read / write.
- Used by ALTER TABLE in MySQL to mark to allow readers
+ Write lock, but allow other threads to read.
+ Used by ALTER TABLE in MySQL to allow readers
to use the table until ALTER TABLE is finished.
*/
TL_WRITE_ALLOW_READ,