mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
d49ee1933f
mysqldump creates stand-in tables before dumping the actual view. Those tables were of the default type; if the view had more columns than that (a pathological case, arguably), loading the dump would fail. We now make the temporary stand-ins MyISAM tables to prevent this. client/mysqldump.c: When creating a stand-in table, specify its type to avoid defaulting to a type with a column-number limit (like Inno). The type is always MyISAM as we know that to be available. mysql-test/r/mysqldump-max.result: add test results for 31434 mysql-test/r/mysqldump.result: mysqldump sets engine-type (MyISAM) for stand-in tables for views now. Update test results. mysql-test/t/mysqldump-max.test: Show that mysqldump's stand-in tables for views explicitly set engine-type to MyISAM to avoid falling back on an engine that might support fewer columns than the final view requires (here's lookin' at you, inno). Also show that this actually has the desired effect by dumping and reloading a view that has more columns than inno supports.
292 lines
10 KiB
Text
292 lines
10 KiB
Text
drop table if exists t1, t2, t3, t4, t5, t6;
|
|
create table t1 (id int(8), name varchar(32));
|
|
create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
|
|
create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY";
|
|
create table t4 (id int(8), name varchar(32)) ENGINE="HEAP";
|
|
create table t5 (id int(8), name varchar(32)) ENGINE="ARCHIVE";
|
|
create table t6 (id int(8), name varchar(32)) ENGINE="InnoDB";
|
|
insert into t1 values (1, 'first value');
|
|
insert into t1 values (2, 'first value');
|
|
insert into t1 values (3, 'first value');
|
|
insert into t1 values (4, 'first value');
|
|
insert into t1 values (5, 'first value');
|
|
insert into t2 values (1, 'first value');
|
|
insert into t2 values (2, 'first value');
|
|
insert into t2 values (3, 'first value');
|
|
insert into t2 values (4, 'first value');
|
|
insert into t2 values (5, 'first value');
|
|
insert into t3 values (1, 'first value');
|
|
insert into t3 values (2, 'first value');
|
|
insert into t3 values (3, 'first value');
|
|
insert into t3 values (4, 'first value');
|
|
insert into t3 values (5, 'first value');
|
|
insert into t4 values (1, 'first value');
|
|
insert into t4 values (2, 'first value');
|
|
insert into t4 values (3, 'first value');
|
|
insert into t4 values (4, 'first value');
|
|
insert into t4 values (5, 'first value');
|
|
insert into t5 values (1, 'first value');
|
|
insert into t5 values (2, 'first value');
|
|
insert into t5 values (3, 'first value');
|
|
insert into t5 values (4, 'first value');
|
|
insert into t5 values (5, 'first value');
|
|
insert into t6 values (1, 'first value');
|
|
insert into t6 values (2, 'first value');
|
|
insert into t6 values (3, 'first value');
|
|
insert into t6 values (4, 'first value');
|
|
insert into t6 values (5, 'first value');
|
|
select * from t1;
|
|
id name
|
|
1 first value
|
|
2 first value
|
|
3 first value
|
|
4 first value
|
|
5 first value
|
|
select * from t2;
|
|
id name
|
|
1 first value
|
|
2 first value
|
|
3 first value
|
|
4 first value
|
|
5 first value
|
|
select * from t3;
|
|
id name
|
|
1 first value
|
|
2 first value
|
|
3 first value
|
|
4 first value
|
|
5 first value
|
|
select * from t4;
|
|
id name
|
|
1 first value
|
|
2 first value
|
|
3 first value
|
|
4 first value
|
|
5 first value
|
|
select * from t5;
|
|
id name
|
|
1 first value
|
|
2 first value
|
|
3 first value
|
|
4 first value
|
|
5 first value
|
|
select * from t6;
|
|
id name
|
|
1 first value
|
|
2 first value
|
|
3 first value
|
|
4 first value
|
|
5 first value
|
|
|
|
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
|
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
|
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
|
/*!40101 SET NAMES utf8 */;
|
|
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
|
|
/*!40103 SET TIME_ZONE='+00:00' */;
|
|
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
|
|
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
|
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
|
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
|
|
|
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
|
|
|
|
USE `test`;
|
|
DROP TABLE IF EXISTS `t1`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t1` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
|
|
INSERT DELAYED IGNORE INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t2`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t2` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t2` DISABLE KEYS */;
|
|
INSERT DELAYED IGNORE INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t2` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t3`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t3` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MEMORY DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t3` DISABLE KEYS */;
|
|
INSERT DELAYED IGNORE INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t3` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t4`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t4` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MEMORY DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t4` DISABLE KEYS */;
|
|
INSERT DELAYED IGNORE INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t4` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t5`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t5` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t5` DISABLE KEYS */;
|
|
INSERT DELAYED IGNORE INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t5` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t6`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t6` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t6` DISABLE KEYS */;
|
|
INSERT IGNORE INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t6` ENABLE KEYS */;
|
|
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
|
|
|
|
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
|
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
|
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
|
|
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
|
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
|
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
|
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
|
|
|
|
|
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
|
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
|
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
|
/*!40101 SET NAMES utf8 */;
|
|
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
|
|
/*!40103 SET TIME_ZONE='+00:00' */;
|
|
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
|
|
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
|
|
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
|
|
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
|
|
|
|
CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
|
|
|
|
USE `test`;
|
|
DROP TABLE IF EXISTS `t1`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t1` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
|
|
INSERT DELAYED INTO `t1` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t2`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t2` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t2` DISABLE KEYS */;
|
|
INSERT DELAYED INTO `t2` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t2` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t3`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t3` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MEMORY DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t3` DISABLE KEYS */;
|
|
INSERT DELAYED INTO `t3` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t3` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t4`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t4` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=MEMORY DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t4` DISABLE KEYS */;
|
|
INSERT DELAYED INTO `t4` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t4` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t5`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t5` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=ARCHIVE DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t5` DISABLE KEYS */;
|
|
INSERT DELAYED INTO `t5` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t5` ENABLE KEYS */;
|
|
DROP TABLE IF EXISTS `t6`;
|
|
SET @saved_cs_client = @@character_set_client;
|
|
SET character_set_client = utf8;
|
|
CREATE TABLE `t6` (
|
|
`id` int(8) DEFAULT NULL,
|
|
`name` varchar(32) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
|
|
SET character_set_client = @saved_cs_client;
|
|
|
|
/*!40000 ALTER TABLE `t6` DISABLE KEYS */;
|
|
INSERT INTO `t6` VALUES (1,'first value'),(2,'first value'),(3,'first value'),(4,'first value'),(5,'first value');
|
|
/*!40000 ALTER TABLE `t6` ENABLE KEYS */;
|
|
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
|
|
|
|
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
|
|
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
|
|
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
|
|
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
|
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
|
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
|
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
|
|
|
|
drop table t1;
|
|
drop table t2;
|
|
drop table t3;
|
|
drop table t4;
|
|
drop table t5;
|
|
drop table t6;
|
|
SELECT @@global.storage_engine INTO @old_engine;
|
|
SET GLOBAL storage_engine=InnoDB;
|
|
CREATE VIEW v1 AS SELECT * FROM t1;
|
|
INSERT INTO t1 VALUES();
|
|
SELECT COUNT(*) FROM v1;
|
|
COUNT(*)
|
|
1
|
|
SELECT COUNT(*) FROM v1;
|
|
COUNT(*)
|
|
1
|
|
DROP VIEW v1;
|
|
DROP TABLE t1;
|
|
SET GLOBAL storage_engine=@old_engine;
|