summaryrefslogtreecommitdiff
path: root/storage/innodb_plugin/thr/thr0loc.c
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-11-10 20:45:15 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-11-10 20:45:15 +0200
commit7eb789a723582a503e6c7b18afee5b92d39dbbd5 (patch)
tree4673f5dde3aac3f1173eb33cbd96a67269d48499 /storage/innodb_plugin/thr/thr0loc.c
parent19c380aaff1f1f3c0d21ac0c18904c21d7bdce76 (diff)
parent3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3 (diff)
downloadmariadb-git-7eb789a723582a503e6c7b18afee5b92d39dbbd5.tar.gz
merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment
Diffstat (limited to 'storage/innodb_plugin/thr/thr0loc.c')
-rw-r--r--storage/innodb_plugin/thr/thr0loc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innodb_plugin/thr/thr0loc.c b/storage/innodb_plugin/thr/thr0loc.c
index 18f7b0707bd..49275be1d7d 100644
--- a/storage/innodb_plugin/thr/thr0loc.c
+++ b/storage/innodb_plugin/thr/thr0loc.c
@@ -62,7 +62,7 @@ struct thr_local_struct{
os_thread_t handle; /*!< operating system handle to the thread */
ulint slot_no;/*!< the index of the slot in the thread table
for this thread */
- ibool in_ibuf;/*!< TRUE if the the thread is doing an ibuf
+ ibool in_ibuf;/*!< TRUE if the thread is doing an ibuf
operation */
hash_node_t hash; /*!< hash chain node */
ulint magic_n;/*!< magic number (THR_LOCAL_MAGIC_N) */