diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2016-03-28 22:18:38 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2016-03-28 22:18:38 +0300 |
| commit | 2bd4dc38e0d5eb257e2e29413dd01239ce075d42 (patch) | |
| tree | dad0557b1d927d012aebd1c36c8c3e00462adcb1 /sql/sql_priv.h | |
| parent | 44fdb56c977259b2801c612116813beda403df78 (diff) | |
| parent | 3df261dc31ab18ee1537f327b07320b0a07fb8f5 (diff) | |
| download | mariadb-git-2bd4dc38e0d5eb257e2e29413dd01239ce075d42.tar.gz | |
Merge branch '10.2' into bb-10.2-mdev9543
Diffstat (limited to 'sql/sql_priv.h')
| -rw-r--r-- | sql/sql_priv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h index 95102c82044..b15a80a889a 100644 --- a/sql/sql_priv.h +++ b/sql/sql_priv.h @@ -320,11 +320,11 @@ /* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */ #define UNDEF_POS (-1) +#endif /* !MYSQL_CLIENT */ + /* BINLOG_DUMP options */ #define BINLOG_DUMP_NON_BLOCK 1 -#endif /* !MYSQL_CLIENT */ - #define BINLOG_SEND_ANNOTATE_ROWS_EVENT 2 #ifndef MYSQL_CLIENT |