summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@skysql.com>2014-06-19 13:12:38 -0400
committerNirbhay Choubey <nirbhay@skysql.com>2014-06-19 13:12:38 -0400
commita76a6601ecb63d452c89202d8ca7f11bf2e0194f (patch)
tree80cefcea92a47dff8c41220411ea237022a82d4c /sql/slave.cc
parent0f5522c44f9ebb002f203ad1f983b77e3925581c (diff)
parent0c64cd83eb392a0d2085eb6340623273a3402d4d (diff)
downloadmariadb-git-a76a6601ecb63d452c89202d8ca7f11bf2e0194f.tar.gz
bzr merge -rtag:mariadb-10.0.12 maria/10.0
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 7e6162c88b4..54a32f320c0 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -4436,7 +4436,7 @@ pthread_handler_t handle_slave_sql(void *arg)
/*
binlog_annotate_row_events must be TRUE only after an Annotate_rows event
- has been recieved and only till the last corresponding rbr event has been
+ has been received and only till the last corresponding rbr event has been
applied. In all other cases it must be FALSE.
*/
thd->variables.binlog_annotate_row_events= 0;