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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-03-26 11:50:32 +02:00
parent e9e1890162 2e67b9f665
commit 356c149603
74 changed files with 151 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/index_merge1.inc
View File

@@ -374,7 +374,7 @@ drop table t1;
if ($merge_table_support)
{
#
# BUG#17314: Index_merge/intersection not choosen by the optimizer for MERGE tables
# BUG#17314: Index_merge/intersection not chosen by the optimizer for MERGE tables
#
create table t1 (
a int, b int,

16
mysql-test/include/ps_conv.inc
View File

@@ -157,7 +157,7 @@ select @arg01:= c1, @arg02:= c2, @arg03:= c3, @arg04:= c4,
@arg25:= c25, @arg26:= c26, @arg27:= c27, @arg28:= c28,
@arg29:= c29, @arg30:= c30, @arg31:= c31, @arg32:= c32
from t9 where c1= 1 ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
@@ -171,7 +171,7 @@ select @arg01:= c1, @arg02:= c2, @arg03:= c3, @arg04:= c4,
@arg25:= c25, @arg26:= c26, @arg27:= c27, @arg28:= c28,
@arg29:= c29, @arg30:= c30, @arg31:= c31, @arg32:= c32
from t9 where c1= 0 ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
@@ -188,14 +188,14 @@ prepare stmt1 from "select
from t9 where c1= ?" ;
set @my_key= 1 ;
execute stmt1 using @my_key ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
# now the same procedure with the record containing so many NULLs
set @my_key= 0 ;
execute stmt1 using @my_key ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
@@ -215,7 +215,7 @@ into @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08,
@arg17, @arg18, @arg19, @arg20, @arg21, @arg22, @arg23, @arg24,
@arg25, @arg26, @arg27, @arg28, @arg29, @arg30, @arg31, @arg32
from t9 where c1= 1 ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
@@ -228,7 +228,7 @@ into @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08,
@arg17, @arg18, @arg19, @arg20, @arg21, @arg22, @arg23, @arg24,
@arg25, @arg26, @arg27, @arg28, @arg29, @arg30, @arg31, @arg32
from t9 where c1= 0 ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
@@ -243,7 +243,7 @@ into @arg01, @arg02, @arg03, @arg04, @arg05, @arg06, @arg07, @arg08,
from t9 where c1= ?" ;
set @my_key= 1 ;
execute stmt1 using @my_key ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata
@@ -251,7 +251,7 @@ execute full_info ;
# Bug#5034: prepared "select 1 into @arg15", second execute crashes server
set @my_key= 0 ;
execute stmt1 using @my_key ;
# get as much informations about the parameters as possible
# get as much information about the parameters as possible
--enable_metadata
execute full_info ;
--disable_metadata