diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 19:28:26 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 19:28:26 +0200 |
| commit | ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7 (patch) | |
| tree | 006fe23182bd63ca669c55ef7f52b6374e7c0df2 /storage/maria/ma_loghandler.c | |
| parent | de76cbdcb0728b80c0f7b453b24b0b81f653e450 (diff) | |
| parent | 622466644dda1e3c72f5fe276e3a8127b20c1182 (diff) | |
| download | mariadb-git-ce07d09fd3eb1abbfe3c2ff75a78ef4eacf34bd7.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/maria/ma_loghandler.c')
| -rw-r--r-- | storage/maria/ma_loghandler.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c index 7a3d4a216dd..129770249aa 100644 --- a/storage/maria/ma_loghandler.c +++ b/storage/maria/ma_loghandler.c @@ -6342,7 +6342,6 @@ my_bool translog_write_record(LSN *lsn, short_trid, &parts, trn, hook_arg); break; case LOGRECTYPE_NOT_ALLOWED: - DBUG_ASSERT(0); default: DBUG_ASSERT(0); rc= 1; |