summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-10 14:42:50 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-10 14:42:50 +0200
commit92c8d6f168f329bf7e3998a4f580781d0239b59a (patch)
tree1105d2015a3a7b9e0bed740eaee027cd30e3b5c3 /plugin
parent8bddaddc6fcd4f146252c2dc149ecbc51cd6c788 (diff)
parentab36eac584a0bef4a048a3fd8ae56ff2cbfcb6cc (diff)
downloadmariadb-git-92c8d6f168f329bf7e3998a4f580781d0239b59a.tar.gz
Merge 10.7 into 10.8
The MDEV-25004 test innodb_fts.versioning is omitted because ever since commit 685d958e38b825ad9829be311f26729cccf37c46 InnoDB would not allow writes to a database where the redo log file ib_logfile0 is missing.
Diffstat (limited to 'plugin')
-rw-r--r--plugin/test_sql_service/test_sql_service.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugin/test_sql_service/test_sql_service.c b/plugin/test_sql_service/test_sql_service.c
index c2dbb93bf20..8b326c6fa46 100644
--- a/plugin/test_sql_service/test_sql_service.c
+++ b/plugin/test_sql_service/test_sql_service.c
@@ -129,6 +129,7 @@ void auditing(MYSQL_THD thd, unsigned int event_class, const void *ev)
static int run_test(MYSQL_THD thd, struct st_mysql_sys_var *var, void *save,
struct st_mysql_value *value)
{
+ *(my_bool*) save= 0; /* Set value for sql_service_run_test */
return (test_passed= (do_tests() == 0)) == 0;
}