diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-31 06:53:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-31 06:53:45 +0300 |
| commit | db4a27ab738c3ab43173368117583402f995c4f1 (patch) | |
| tree | 01a367ede38cc8ede00038a904c96b76e570de5f /sql/mysqld.cc | |
| parent | d1ef02e9592b744d6c8dbca9231152f0a58d4384 (diff) | |
| parent | 396da1a70548f80ecf781cf352b0d4a5740c54f6 (diff) | |
| download | mariadb-git-db4a27ab738c3ab43173368117583402f995c4f1.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fc7e82936ea..a4118ced910 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6719,6 +6719,10 @@ struct my_option my_long_options[]= 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #endif /* HAVE_REPLICATION */ #ifndef DBUG_OFF + {"debug-assert", 0, + "Allow DBUG_ASSERT() to invoke assert()", + &my_assert, &my_assert, + 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, {"debug-assert-on-error", 0, "Do an assert in various functions if we get a fatal error", &my_assert_on_error, &my_assert_on_error, |