Merge bk-internal.mysql.com:/home/bk/mysql-4.1 (4799f077) · Commits · Software / OSDI20 Artifacts / mariadb

innobase/os/os0file.c

+15 −9

Original line number	Diff line number	Diff line
		@@ -486,7 +486,7 @@ os_io_init_simple(void)
		}
		}

		#ifndef UNIV_HOTBACKUP
		#if !defined(UNIV_HOTBACKUP) && !defined(__NETWARE__)
		/*************************************************************************
		Creates a temporary file. This function is defined in ha_innodb.cc. */

		@@ -494,7 +494,7 @@ int
		innobase_mysql_tmpfile(void);
		/========================/
		/* out: temporary file descriptor, or < 0 on error */
		#endif /* !UNIV_HOTBACKUP */
		#endif /* !UNIV_HOTBACKUP && !__NETWARE__ */

		/***************************************************************************
		Creates a temporary file. */
		@@ -504,6 +504,9 @@ os_file_create_tmpfile(void)
		/========================/
		/* out: temporary file handle, or NULL on error */
		{
		#ifdef __NETWARE__
		FILE* file = tmpfile();
		#else /* __NETWARE__ */
		FILE* file = NULL;
		int fd = -1;
		# ifdef UNIV_HOTBACKUP
		@@ -541,15 +544,18 @@ os_file_create_tmpfile(void)
		if (fd >= 0) {
		file = fdopen(fd, "w+b");
		}
		#endif /* __NETWARE__ */

		if (!file) {
		ut_print_timestamp(stderr);
		fprintf(stderr,
		" InnoDB: Error: unable to create temporary file;"
		" errno: %d\n", errno);
		#ifndef __NETWARE__
		if (fd >= 0) {
		close(fd);
		}
		#endif /* !__NETWARE__ */
		}

		return(file);

mysql-test/r/ctype_utf8.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -412,7 +412,7 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c` char(10) character set utf8 default NULL,
		UNIQUE KEY `a` (`c`(1))
		UNIQUE KEY `a` TYPE HASH (`c`(1))
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
		insert into t1 values ('aa');
		@@ -570,7 +570,7 @@ show create table t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`c` char(10) character set utf8 collate utf8_bin default NULL,
		UNIQUE KEY `a` (`c`(1))
		UNIQUE KEY `a` TYPE HASH (`c`(1))
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');
		insert into t1 values ('aa');

mysql-test/r/show_check.result

+70 −0

Original line number	Diff line number	Diff line
		@@ -405,3 +405,73 @@ where user='mysqltest_1' \|\| user='mysqltest_2' \|\| user='mysqltest_3';
		delete from mysql.db
		where user='mysqltest_1' \|\| user='mysqltest_2' \|\| user='mysqltest_3';
		flush privileges;
		CREATE TABLE t1 (i int, KEY (i)) ENGINE=MEMORY;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` (`i`)
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1 (i int, KEY USING HASH (i)) ENGINE=MEMORY;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` TYPE HASH (`i`)
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MEMORY;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` TYPE BTREE (`i`)
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` (`i`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` TYPE BTREE (`i`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1 (i int, KEY (i)) ENGINE=MyISAM;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` (`i`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		ALTER TABLE t1 ENGINE=MEMORY;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` (`i`)
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		DROP TABLE t1;
		CREATE TABLE t1 (i int, KEY USING BTREE (i)) ENGINE=MyISAM;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` TYPE BTREE (`i`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		ALTER TABLE t1 ENGINE=MEMORY;
		SHOW CREATE TABLE t1;
		Table Create Table
		t1 CREATE TABLE `t1` (
		`i` int(11) default NULL,
		KEY `i` TYPE BTREE (`i`)
		) ENGINE=HEAP DEFAULT CHARSET=latin1
		DROP TABLE t1;

mysql-test/r/type_float.result

+15 −0

Original line number	Diff line number	Diff line
		@@ -179,3 +179,18 @@ f
		9.999
		9.999
		drop table if exists t1;
		create table t1 (c char(20));
		insert into t1 values (5e-28);
		select * from t1;
		c
		5e-28
		drop table t1;
		create table t1 (c char(6));
		insert into t1 values (2e5),(2e6),(2e-4),(2e-5);
		select * from t1;
		c
		200000
		2e+06
		0.0002
		2e-05
		drop table t1;

mysql-test/r/type_float.result.es

+15 −0

Original line number	Diff line number	Diff line
		@@ -179,3 +179,18 @@ f
		9.999
		9.999
		drop table if exists t1;
		create table t1 (c char(20));
		insert into t1 values (5e-28);
		select * from t1;
		c
		5e-28
		drop table t1;
		create table t1 (c char(6));
		insert into t1 values (2e5),(2e6),(2e-4),(2e-5);
		select * from t1;
		c
		200000
		2e+06
		0.0002
		2e-05
		drop table t1;