Commit 43f31db5 authored by gni@dev3-221.dev.cn.tlan's avatar gni@dev3-221.dev.cn.tlan
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
parents 3677a2dd c891d928
Loading
Loading
Loading
Loading
+38 −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;
ERROR HY000: Can't create table 'test.#sql-7b9e_3' (errno: 4335)
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
+43 −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;

--error 1005
ALTER TABLE t3
ENGINE NDBCLUSTER;

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
 */
+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ struct CreateFileImplRef {
    InvalidFileMetadata = 1510,
    OutOfMemory = 1511,
    FileReadError = 1512,
    FilegroupNotOnline = 1513
    FilegroupNotOnline = 1513,
    FileSizeTooLarge = 1515
  };
  
  Uint32 senderData;
Loading