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ä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/funcs_1/triggers/triggers_08.inc
View File

@@ -123,8 +123,10 @@ let $message= 3.5.8.4 - multiple SQL;
select * from db_test.t1_u;
--sorted_result
select * from db_test.t1_d;
#Check after fix MDEV-31495
--disable_cursor_protocol
select @test_var;
--enable_cursor_protocol
let $message= 3.5.8.4 - single SQL - insert;
--source include/show_msg.inc
@@ -201,7 +203,10 @@ let $message= 3.5.8.3/4 - single SQL - select;
f122='Test 3.5.8.4-Single Select'
where f122='Test 3.5.8.4-Single Delete';
Select f120, f122, f136, f144, f163 from tb3 where f122 like 'Test 3.5.8.4%';
#Check after fix MDEV-31495
--disable_cursor_protocol
select @test_var;
--enable_cursor_protocol
#Cleanup
connection default;

14
mysql-test/suite/funcs_1/triggers/triggers_09.inc
View File

@@ -93,10 +93,13 @@ let $message= Testcase 3.5.9.3:;
Update tb3 Set f136=8 where f122='Test 3.5.9.3';
select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
#Check after fix MDEV-31495
--disable_cursor_protocol
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_163;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_163;
--enable_cursor_protocol
--disable_query_log
set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0,
@@ -112,10 +115,14 @@ let $message= Testcase 3.5.9.3:;
delete from tb3 where f122='Test 3.5.9.3';
select f118, f121, f122, f136, f163 from tb3 where f122='Test 3.5.9.3' order by f136;
#Check after fix MDEV-31495
--disable_cursor_protocol
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_163;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_163;
--enable_cursor_protocol
#Cleanup
--disable_warnings
drop trigger trg2_a;
@@ -167,10 +174,13 @@ let $message= Testcase 3.5.9.4:;
select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4%' order by f163;
#Check after fix MDEV-31495
--disable_cursor_protocol
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
--enable_cursor_protocol
--disable_query_log
set @tr_var_b4_118=0, @tr_var_b4_121=0, @tr_var_b4_122=0,
@@ -188,10 +198,14 @@ let $message= Testcase 3.5.9.4:;
select f118, f121, f122, f136, f151, f163 from tb3
where f122 like 'Test 3.5.9.4-trig' order by f163;
#Check after fix MDEV-31495
--disable_cursor_protocol
select @tr_var_b4_118, @tr_var_b4_121, @tr_var_b4_122,
@tr_var_b4_136, @tr_var_b4_151, @tr_var_b4_163;
select @tr_var_af_118, @tr_var_af_121, @tr_var_af_122,
@tr_var_af_136, @tr_var_af_151, @tr_var_af_163;
--enable_cursor_protocol
#Cleanup
--disable_warnings
drop trigger trg3_a;