Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 (369b4848) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/view.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -2715,12 +2715,12 @@ View Create View character_set_client collation_connection
		v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select (year(`t1`.`test_date`) - year(`t1`.`DOB`)) AS `Age` from `t1` having (`Age` < 75) latin1 latin1_swedish_ci
		SELECT (year(test_date)-year(DOB)) AS Age FROM t1 HAVING Age < 75;
		Age
		43
		39
		44
		40
		SELECT * FROM v1;
		Age
		43
		39
		44
		40
		DROP VIEW v1;
		DROP TABLE t1;
		CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a char(6) DEFAULT 'xxx');

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		DROP TABLE IF EXISTS t1,t2,t3;
		USE test;
		CREATE TABLE t1 (
		id INT AUTO_INCREMENT,
		PRIMARY KEY(id)
		) ENGINE=NDBCLUSTER;
		CREATE TABLE t2 (
		id INT AUTO_INCREMENT,
		KEY(id)
		) ENGINE=NDBCLUSTER;
		ERROR HY000: Can't create table 'test.t2' (errno: 4335)
		SHOW TABLES;
		Tables_in_test
		t1
		CREATE TABLE t3 (
		id INT AUTO_INCREMENT,
		KEY(id)
		) ENGINE=MYISAM;
		ALTER TABLE t3
		ENGINE NDBCLUSTER;
		SHOW CREATE TABLE t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		`id` int(11) NOT NULL AUTO_INCREMENT,
		KEY `id` (`id`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		ALTER TABLE t3
		ADD PRIMARY KEY (id);
		SHOW CREATE TABLE t3;
		Table Create Table
		t3 CREATE TABLE `t3` (
		`id` int(11) NOT NULL AUTO_INCREMENT,
		PRIMARY KEY (`id`),
		KEY `id` (`id`)
		) ENGINE=MyISAM DEFAULT CHARSET=latin1
		DROP TABLE t1, t3;
		End of 5.1 tests

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		-- source include/have_ndb.inc
		-- source include/not_embedded.inc

		--disable_warnings
		DROP TABLE IF EXISTS t1,t2,t3;
		--enable_warnings

		USE test;

		CREATE TABLE t1 (
		id INT AUTO_INCREMENT,
		PRIMARY KEY(id)
		) ENGINE=NDBCLUSTER;

		# Test For bug#30417
		--error 1005

		CREATE TABLE t2 (
		id INT AUTO_INCREMENT,
		KEY(id)
		) ENGINE=NDBCLUSTER;

		SHOW TABLES;

		CREATE TABLE t3 (
		id INT AUTO_INCREMENT,
		KEY(id)
		) ENGINE=MYISAM;

		--disable_result_log
		--error 1005
		ALTER TABLE t3
		ENGINE NDBCLUSTER;
		--enable_result_log

		SHOW CREATE TABLE t3;

		ALTER TABLE t3
		ADD PRIMARY KEY (id);

		SHOW CREATE TABLE t3;

		DROP TABLE t1, t3;

		--echo End of 5.1 tests

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@

		# Storage engine to be used in CREATE TABLE
		--source include/have_ndb.inc
		connection default;

		let $engine_type= NDB;

+11 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,17 @@
		#define MAX_NODES 64
		#define UNDEF_NODEGROUP 0xFFFF

		/**************************************************************************
		* IT SHOULD BE (MAX_NDB_NODES - 1).
		* WHEN MAX_NDB_NODE IS CHANGED, IT SHOULD BE CHANGED ALSO
		**************************************************************************/
		#define MAX_DATA_NODE_ID 48
		/**************************************************************************
		* IT SHOULD BE (MAX_NODES - 1).
		* WHEN MAX_NODES IS CHANGED, IT SHOULD BE CHANGED ALSO
		**************************************************************************/
		#define MAX_NODES_ID 63

		/**
		* MAX_API_NODES = MAX_NODES - No of NDB Nodes in use
		*/