MDEV-31401 [demo] mysqld_server_started is no substitute for udf_init…

…ialized ...when it comes to decide whether to insert into mysql.func or create function. The test udf_mysql_func_early fails.
MariaDB · Jun 13, 2023 · 91176a7 · 91176a7
1 parent a2e71bc
commit 91176a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.opt b/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.opt
@@ -1 +1 @@
---plugin-load-add=ha_spider
+--init-file=$MYSQL_TEST_DIR/../storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.sql
diff --git a/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.sql b/storage/spider/mysql-test/spider/bugfix/t/udf_mysql_func_early.sql
@@ -0,0 +1 @@
+install soname "ha_spider.so";
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
@@ -6556,10 +6556,10 @@ bool spider_init_system_tables()
   }
 
   const int size= sizeof(spider_init_queries) / sizeof(spider_init_queries[0]);
-  LEX_STRING *udf_queries= udf_initialized ?
+  LEX_STRING *udf_queries= mysqld_server_started ?
     (LEX_STRING *) spider_init_udf_queries :
     (LEX_STRING *) spider_init_early_udf_queries;
-  const int udf_size = udf_initialized ?
+  const int udf_size = mysqld_server_started ?
     sizeof(spider_init_udf_queries) / sizeof(spider_init_udf_queries[0]) :
     sizeof(spider_init_early_udf_queries) / sizeof(spider_init_early_udf_queries[0]);
   for (int i= 0; i < size + udf_size; i++)