diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-13 01:33:24 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-04-13 01:33:24 +0300 |
| commit | 2fc1ec43560b453b4694adbc1aac11f3f23b1761 (patch) | |
| tree | 880c3875dae28574a90bf891ef901027723d21f6 /sql/sql_lex.cc | |
| parent | 51c77ec5d406843bb8c8131f0687f4f75839d045 (diff) | |
| download | mariadb-git-2fc1ec43560b453b4694adbc1aac11f3f23b1761.tar.gz | |
Initial push of codership-wsrep API implementation for MariaDB.
Merge of:
lp:maria/5.5, #3334: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3334
lp:codership-mysql/5.5, #3725: http://bazaar.launchpad.net/~codership/codership-mysql/wsrep-5.5/revision/3725
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b2dfae5ded4..070bcdfcfd4 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1548,6 +1548,17 @@ int lex_one_token(void *arg, void *yythd) } else { +#ifdef WITH_WSREP + if (version == 99997 && thd->wsrep_exec_mode == LOCAL_STATE) + { + WSREP_DEBUG("consistency check: %s", thd->query()); + thd->wsrep_consistency_check= TRUE; + lip->yySkipn(5); + lip->set_echo(TRUE); + state=MY_LEX_START; + break; /* Do not treat contents as a comment. */ + } +#endif /* WITH_WSREP */ /* Patch and skip the conditional comment to avoid it being propagated infinitely (eg. to a slave). |