diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-22 13:03:41 +0200 |
| commit | 9d2e2d753323a934604d25144b9d1ecaf34b47d8 (patch) | |
| tree | 051a721f7ea77c2278d09323e36088abe22aa66a /sql/sql_lex.cc | |
| parent | d11af09865299033d5eef64531704f6ab8af5304 (diff) | |
| parent | 2eb3c5e5420a724945a4cba914df25aa1e3744ce (diff) | |
| download | mariadb-git-9d2e2d753323a934604d25144b9d1ecaf34b47d8.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b3a30c69a03..8edd9b3fbd8 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -4861,4 +4861,3 @@ void binlog_unsafe_map_init() BINLOG_DIRECT_OFF & TRX_CACHE_NOT_EMPTY); } #endif - |