Merge branch 'mysql-8.4' into mysql-trunk

nacarvalho · nacarvalho · commit cc1bbfbfe688 · 2025-02-22T16:18:52.000+01:00
Change-Id: I89bd2e05b05f61ac6cd98bd833c477411fee74ab
diff --git a/sql/rpl_async_conn_failover_add_source_udf.cc b/sql/rpl_async_conn_failover_add_source_udf.cc
@@ -128,7 +128,7 @@ bool Rpl_async_conn_failover_add_source::add_source_init(UDF_INIT *init_id,
     return true;
   }
 
-  if (args->arg_type[2] != INT_RESULT) {
+  if (args->arg_type[2] != INT_RESULT || args->args[2] == nullptr) {
     my_stpcpy(message, "Wrong arguments: You need to specify value for port.");
     return true;
   }
@@ -141,7 +141,8 @@ bool Rpl_async_conn_failover_add_source::add_source_init(UDF_INIT *init_id,
   }
 
   if (args->arg_count == 5 &&
-      (args->arg_type[4] != INT_RESULT || (*((long long *)args->args[4]) < 1) ||
+      (args->arg_type[4] != INT_RESULT || args->args[4] == nullptr ||
+       (*((long long *)args->args[4]) < 1) ||
        (*((long long *)args->args[4]) > 100))) {
     my_stpcpy(message,
               "Wrong arguments: The weight argument value should be integer "

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ bool Rpl_async_conn_failover_add_source::add_source_init(UDF_INIT *init_id,`
`128`	`128`	`return true;`
`129`	`129`	`}`
`130`	`130`
`131`		`- if (args->arg_type[2] != INT_RESULT) {`
	`131`	`+ if (args->arg_type[2] != INT_RESULT \|\| args->args[2] == nullptr) {`
`132`	`132`	`my_stpcpy(message, "Wrong arguments: You need to specify value for port.");`
`133`	`133`	`return true;`
`134`	`134`	`}`
`@@ -141,7 +141,8 @@ bool Rpl_async_conn_failover_add_source::add_source_init(UDF_INIT *init_id,`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`if (args->arg_count == 5 &&`
`144`		`- (args->arg_type[4] != INT_RESULT \|\| (((long long )args->args[4]) < 1) \|\|`
	`144`	`+ (args->arg_type[4] != INT_RESULT \|\| args->args[4] == nullptr \|\|`
	`145`	`+ (((long long )args->args[4]) < 1) \|\|`
`145`	`146`	`(((long long )args->args[4]) > 100))) {`
`146`	`147`	`my_stpcpy(message,`
`147`	`148`	`"Wrong arguments: The weight argument value should be integer "`