1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge branch '10.6' into 10.11

This commit is contained in:
Sergei Golubchik
2024-04-22 11:00:03 +02:00
418 changed files with 7074 additions and 2930 deletions

View File

@@ -129,7 +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 */
*(my_bool*)save= 1; // must initialize the return value
return (test_passed= (do_tests() == 0)) == 0;
}
@@ -140,6 +140,7 @@ static int run_sql(MYSQL *mysql, void *save, struct st_mysql_value *value)
int len= 0;
MYSQL_RES *res;
*(my_bool*)save= 1; // must initialize the return value
str= value->val_str(value, NULL, &len);
if (mysql_real_query(mysql, str, len))