Commit c6815ae4 authored by Matthias Leich's avatar Matthias Leich
Browse files

Merge of fixes for Bug#38427 and Bug#38762 into actual tree 

(no conflicts)
parents cfdf3db4 e1ea011c

mysql-test/r/federated_bug_25714.result

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ DROP DATABASE IF EXISTS federated; 
CREATE DATABASE federated;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

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 (

`id` int auto_increment primary key,
@@ -49,7 +53,9 @@ 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;

mysql-test/suite/funcs_1/views/func_view.inc

+7 −1
Original line number Diff line number Diff line
@@ -157,10 +157,16 @@ DROP VIEW IF EXISTS v1; 


--disable_query_log

# Storage for the SELECTs to be used for the VIEW definition

# Attention: my_select must be no too small because a statement like

#    SELECT LOAD_FILE(< file in MYSQLTEST_VARDIR >)

#    AS my_col,

#    id FROM t1_values';

#    might be a very long

# Bug#38427 "Data too long" ... tests "<ENGINE>_func_view" fail

CREATE TABLE t1_selects

(

   id BIGINT AUTO_INCREMENT,

   my_select VARCHAR(200) NOT NULL,

   my_select VARCHAR(1000) NOT NULL,

   disable_result ENUM('Yes','No') NOT NULL default 'No',

   PRIMARY KEY(id),

   UNIQUE (my_select)

mysql-test/t/federated_bug_25714.test

+11 −0
Original line number Diff line number Diff line 
--source include/have_bug25714.inc

source include/federated.inc;



connection master;

# Disable concurrent inserts to avoid test failures when reading

# data from concurrent connections (insert might return before

# the data is actually in the table).

SET @OLD_MASTER_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT= 0;



connection slave;

SET @OLD_SLAVE_CONCURRENT_INSERT= @@GLOBAL.CONCURRENT_INSERT;

SET @@GLOBAL.CONCURRENT_INSERT= 0;

--disable_warnings

DROP TABLE IF EXISTS federated.bug_13118_table;

--enable_warnings
@@ -39,9 +47,12 @@ SELECT LAST_INSERT_ID(); 
SELECT * from federated.t1;



DROP TABLE federated.t1;

SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;

connection slave;

DROP TABLE federated.t1;

SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;





source include/federated_cleanup.inc;