mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.11' into 11.0

Browse source
This commit is contained in:
Oleksandr Byelkin 2023-08-08 21:03:46 +02:00
commit 51f9d62005
870 changed files with 11717 additions and 6307 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/async_queries.c
View file

@ -371,7 +371,7 @@ main(int argc, char *argv[])
if (err)
exit(err);
if (tty_password)
opt_password= get_tty_password(NullS);
opt_password= my_get_tty_password(NullS);
if (opt_query_file)
{

2
tests/mysql_client_fw.c
View file

@ -1366,7 +1366,7 @@ static void get_options(int *argc, char ***argv)
exit(ho_error);
if (tty_password)
opt_password= get_tty_password(NullS);
opt_password= my_get_tty_password(NullS);
return;
}

44
tests/mysql_client_test.c
View file

@ -21583,6 +21583,49 @@ static void test_mdev20261()
myquery(rc);
}
static void test_mdev_30159()
{
MYSQL_RES *result;
int rc;
myheader("test_mdev_30159");
rc= mysql_query(mysql, "create table t1 ("
" name varchar(100),"
" typ varchar(100)"
")");
myquery(rc);
rc= mysql_query(mysql, "insert into t1 values (1,1),(2,2),(3,3),(4,4),(5,5),"
"(6,6),(7,7),(8,8),(9,9),(10,10)");
myquery(rc);
rc= mysql_query(mysql, "insert into t1 values ('', 'value'),('', 'value')");
myquery(rc);
rc= mysql_query(mysql, "create table t2 ("
" servername varchar(100)"
")");
myquery(rc);
rc= mysql_query(mysql, "insert into t2 values (1),(2),(3),(4),(5),"
"(6),(7),(8),(9),(10)");
myquery(rc);
rc= mysql_query(mysql, "create view v1 as"
" select * from t2"
" where"
" `t2`.`servername` regexp ( select"
" group_concat(`t1`.`name` separator '|')"
" from `t1`"
" where `t1`.`typ`"
" like 'value')");
myquery(rc);
result= mysql_list_fields(mysql, "v1", NULL);
mytest(result);
mysql_free_result(result);
rc= mysql_query(mysql, "drop view v1");
myquery(rc);
rc= mysql_query(mysql, "drop table t1, t2");
myquery(rc);
}
static void test_execute_direct()
{
@ -22106,6 +22149,7 @@ static struct my_tests_st my_tests[]= {
{ "test_mdev_16128", test_mdev_16128 },
{ "test_mdev18408", test_mdev18408 },
{ "test_mdev20261", test_mdev20261 },
{ "test_mdev_30159", test_mdev_30159 },
{ "test_execute_direct", test_execute_direct },
{ "test_cache_metadata", test_cache_metadata},
{ "test_mdev_10075", test_mdev_10075},

2
tests/thread_test.c
View file

@ -174,7 +174,7 @@ static void get_options(int argc, char **argv)
free_defaults(argv);
if (tty_password)
password=get_tty_password(NullS);
password=my_get_tty_password(NullS);
return;
}