diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-25 17:10:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-25 17:10:25 +0400 |
| commit | fbfa0043279757b2860e846c82cbf55ab92af9b8 (patch) | |
| tree | 931fad7c7ee8f9db15f7b46779eec9fb91287efa /sql | |
| parent | 64923bb653f908a6ea422a2d252011f93056f41c (diff) | |
| download | mariadb-git-fbfa0043279757b2860e846c82cbf55ab92af9b8.tar.gz | |
MDEV-6170 Incorrect ordering with utf8_bin and utf8mb4_bin collations
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index ceb4e247848..0de67297302 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -11305,7 +11305,10 @@ opt_limit_clause: limit_clause: LIMIT limit_options { - Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT); + SELECT_LEX *sel= Select; + if (!sel->select_limit->basic_const_item() || + sel->select_limit->val_int() > 0) + Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT); } | LIMIT limit_options ROWS_SYM EXAMINED_SYM limit_rows_option { |