Commit 85d5121a authored by Matthias Leich's avatar Matthias Leich
Browse files

Merge of fixes for Bug#36874,#38427,#37744,#38762 

with actual tree
parents 1b488e52 c6815ae4 85d8b39b

mysql-test/r/federated_bug_25714.result

+5 −2
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ DROP DATABASE IF EXISTS federated; 
CREATE DATABASE federated;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

SET @OLD_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT= 0;

SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT= 0;

DROP TABLE IF EXISTS federated.bug_13118_table;

CREATE TABLE federated.t1 (
@@ -51,9 +53,10 @@ id value 
7	54

8	55

DROP TABLE federated.t1;

SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;

DROP TABLE federated.t1;

SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;
 
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_CONCURRENT_INSERT;

mysql-test/r/slow_launch_time_func.result

+10 −30
Original line number Diff line number Diff line 
SET @global_slow_launch_time = @@GLOBAL.slow_launch_time;

'#--------------------FN_DYNVARS_124_01-------------------------#'

** Connection default **

'#--------------------FN_DYNVARS_124_01-------------------------#'

SET @@GLOBAL.slow_launch_time=0;

SELECT @@GLOBAL.slow_launch_time;

@@GLOBAL.slow_launch_time

0

** Connecting conn5 using username 'root' **

** Connecting conn6 using username 'root' **

** Connecting conn7 using username 'root' **

** Connecting conn8 using username 'root' **

** Connecting conn9 using username 'root' **

** Connecting conn10 using username 'root' **

** Connecting conn11 using username 'root' **

** Connecting conn12 using username 'root' **

** Connecting conn13 using username 'root' **

** Connecting conn14 using username 'root' **

** Connecting conn15 using username 'root' **

** Connecting conn16 using username 'root' **

show status like 'slow_launch_threads';

Variable_name	Value

Slow_launch_threads	12

12 Expected

** Connection default **

** Disconnecting conn5 **

** Disconnecting conn6 **

** Disconnecting conn7 **

** Disconnecting conn8 **

** Disconnecting conn9 **

** Disconnecting conn10 **

** Disconnecting conn11 **

** Disconnecting conn12 **

** Disconnecting conn13 **

** Disconnecting conn14 **

** Disconnecting conn15 **

** Disconnecting conn16 **

** Connecting conn1 using username 'root' **

** Switch to connection default and disconnect conn1 **

'#--------------------FN_DYNVARS_124_02-------------------------#'

SET @@GLOBAL.slow_launch_time= 1000;

SELECT @@GLOBAL.slow_launch_time;

@@GLOBAL.slow_launch_time

1000

** Connecting conn2 using username 'root' **

** Switch to connection default and disconnect conn2 **

SET @@GLOBAL.slow_launch_time = @global_slow_launch_time;

mysql-test/suite/funcs_1/r/memory_storedproc.result

deleted100644 → 0
+0 −23608

File deleted.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/r/myisam_storedproc.result

deleted100644 → 0
+0 −23608

File deleted.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/r/ndb_storedproc.result

deleted100644 → 0
+0 −23607

File deleted.

Preview size limit exceeded, changes collapsed.