database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-02 02:53:04 +03:00
Code Activity

Merge branch '10.9' into 10.10

Browse Source
This commit is contained in:
Oleksandr Byelkin
2023-08-05 16:14:46 +02:00
parent b1b47264d2 998edc374e
commit ced243a099
867 changed files with 12543 additions and 6345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysqldump.c
View File

@@ -1323,7 +1323,7 @@ static int get_options(int *argc, char ***argv)
return EX_USAGE;
}
if (tty_password)
opt_password=get_tty_password(NullS);
opt_password=my_get_tty_password(NullS);
return(0);
} /* get_options */
@@ -2818,11 +2818,7 @@ static uint dump_routines_for_db(char *db)
routine_type[i], routine_name);
if (mysql_query_with_error_report(mysql, &routine_res, query_buff))
{
mysql_free_result(routine_list_res);
routine_list_res= 0;
DBUG_RETURN(1);
}
continue;
while ((row= mysql_fetch_row(routine_res)))
{