auto-merge (de00650d) · Commits · Software / OSDI20 Artifacts / mariadb

Makefile.am

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ bin-dist: all
		$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@

		# Remove BK's "SCCS" subdirectories from source distribution
		# Create initial database files for Windows installations.
		# Create initial database files for Windows installations and check them.
		dist-hook:
		rm -rf `find $(distdir) -type d -name SCCS -print`
		mkdir -p $(distdir)/win
		@@ -57,6 +57,7 @@ dist-hook:
		--builddir=$(top_builddir) \
		--datadir=$(distdir)/win/data \
		--srcdir=$(top_srcdir)
		storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI

		tags:
		support-files/build-tags

mysql-test/Makefile.am

+2 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ dist-hook:
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(distdir)/std_data/ndb_backup51_data_be
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(distdir)/std_data/ndb_backup51_data_le
		$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(distdir)/std_data/parts
		$(INSTALL_DATA) $(srcdir)/std_data/parts/.MY $(distdir)/std_data/parts
		$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(distdir)/std_data/funcs_1
		$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
		$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
		@@ -132,6 +133,7 @@ install-data-local:
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_be/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_be
		$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51_data_le/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51_data_le
		$(INSTALL_DATA) $(srcdir)/std_data/parts/part_* $(DESTDIR)$(testdir)/std_data/parts
		$(INSTALL_DATA) $(srcdir)/std_data/parts/.MY $(DESTDIR)$(testdir)/std_data/parts
		$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/* $(DESTDIR)$(testdir)/std_data/funcs_1
		$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
		$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My

mysql-test/r/innodb-autoinc-optimize.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,4 +3,5 @@ create table t1(a int not null auto_increment primary key) engine=innodb;
		insert into t1 set a = -1;
		optimize table t1;
		Table Op Msg_type Msg_text
		test.t1 optimize note Table does not support optimize, doing recreate + analyze instead
		test.t1 optimize status OK

mysql-test/r/innodb-autoinc.result

0 → 100644

+171 −0

Original line number	Diff line number	Diff line
		drop table if exists t1;
		CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (9223372036854775807, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		9223372036854775807 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 TINYINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (127, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		127 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 TINYINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (255, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		255 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 SMALLINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (32767, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		32767 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 SMALLINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (65535, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		65535 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 MEDIUMINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (8388607, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		8388607 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 MEDIUMINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (16777215, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		16777215 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 INT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (2147483647, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		2147483647 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 INT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (4294967295, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		4294967295 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 BIGINT PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (9223372036854775807, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		9223372036854775807 NULL
		DROP TABLE t1;
		CREATE TABLE t1 (c1 BIGINT UNSIGNED PRIMARY KEY AUTO_INCREMENT, c2 VARCHAR(10)) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (18446744073709551615, null);
		INSERT INTO t1 (c2) VALUES ('innodb');
		Got one of the listed errors
		SELECT * FROM t1;
		c1 c2
		18446744073709551615 NULL
		DROP TABLE t1;
		CREATE TABLE t1(c1 INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (1), (2), (3);
		INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
		SELECT c1 FROM t1;
		c1
		1
		2
		3
		4
		5
		6
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c1` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`c1`)
		) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1
		TRUNCATE TABLE t1;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c1` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`c1`)
		) ENGINE=InnoDB DEFAULT CHARSET=latin1
		INSERT INTO t1 VALUES (1), (2), (3);
		INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
		SELECT c1 FROM t1;
		c1
		1
		2
		3
		4
		5
		6
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c1` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`c1`)
		) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1(c1 INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
		INSERT INTO t1 VALUES (1), (2), (3);
		INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
		SELECT c1 FROM t1;
		c1
		1
		2
		3
		4
		5
		6
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c1` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`c1`)
		) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1
		DELETE FROM t1;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c1` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`c1`)
		) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1
		INSERT INTO t1 VALUES (1), (2), (3);
		INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
		SELECT c1 FROM t1;
		c1
		1
		2
		3
		7
		8
		9
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c1` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`c1`)
		) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=latin1
		DROP TABLE t1;

mysql-test/r/innodb.result

+11 −0

Original line number	Diff line number	Diff line
		@@ -3267,3 +3267,14 @@ AUTO_INCREMENT
		200
		DROP TABLE t2;
		DROP TABLE t1;
		CREATE TABLE t1 (c1 int default NULL,
		c2 int default NULL
		) ENGINE=InnoDB DEFAULT CHARSET=latin1;
		TRUNCATE TABLE t1;
		affected rows: 0
		INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
		affected rows: 5
		info: Records: 5 Duplicates: 0 Warnings: 0
		TRUNCATE TABLE t1;
		affected rows: 0
		DROP TABLE t1;