summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0log.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-08-31 06:53:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-08-31 06:53:45 +0300
commitdb4a27ab738c3ab43173368117583402f995c4f1 (patch)
tree01a367ede38cc8ede00038a904c96b76e570de5f /storage/innobase/row/row0log.cc
parentd1ef02e9592b744d6c8dbca9231152f0a58d4384 (diff)
parent396da1a70548f80ecf781cf352b0d4a5740c54f6 (diff)
downloadmariadb-git-db4a27ab738c3ab43173368117583402f995c4f1.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/row/row0log.cc')
-rw-r--r--storage/innobase/row/row0log.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/row/row0log.cc b/storage/innobase/row/row0log.cc
index 1a10657cf99..fb0a376dd34 100644
--- a/storage/innobase/row/row0log.cc
+++ b/storage/innobase/row/row0log.cc
@@ -1795,6 +1795,7 @@ row_log_table_apply_insert(
break;
default:
ut_ad(0);
+ /* fall through */
case DB_INVALID_NULL:
ut_ad(row == NULL);
return(error);
@@ -2082,6 +2083,7 @@ row_log_table_apply_update(
break;
default:
ut_ad(0);
+ /* fall through */
case DB_INVALID_NULL:
ut_ad(row == NULL);
return(error);