Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1957 05/06/13 16:50:12 tomas@stripped +9 -0
added some error code mappings for ndbcluster
storage/ndb/src/ndbapi/ndberror.c
1.44 05/06/13 16:50:07 tomas@stripped +8 -8
added some error code mappings for ndbcluster
sql/ha_ndbcluster.cc
1.278 05/06/13 16:50:07 tomas@stripped +1 -39
added some error code mappings for ndbcluster
mysql-test/t/rpl_ndb_idempotent.test
1.7 05/06/13 16:50:07 tomas@stripped +5 -4
added some error code mappings for ndbcluster
mysql-test/t/ndb_multi.test
1.5 05/06/13 16:50:07 tomas@stripped +2 -1
added some error code mappings for ndbcluster
mysql-test/t/ndb_bitfield.test
1.3 05/06/13 16:50:07 tomas@stripped +2 -1
added some error code mappings for ndbcluster
mysql-test/t/ndb_alter_table.test
1.22 05/06/13 16:50:07 tomas@stripped +1 -0
added some error code mappings for ndbcluster
mysql-test/r/ndb_multi.result
1.4 05/06/13 16:50:07 tomas@stripped +6 -1
added some error code mappings for ndbcluster
mysql-test/r/ndb_bitfield.result
1.3 05/06/13 16:50:07 tomas@stripped +10 -2
added some error code mappings for ndbcluster
mysql-test/r/ndb_alter_table.result
1.29 05/06/13 16:50:06 tomas@stripped +5 -0
added some error code mappings for ndbcluster
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/mysql-5.1-wl2325
--- 1.28/mysql-test/r/ndb_alter_table.result 2005-04-08 19:41:00 +02:00
+++ 1.29/mysql-test/r/ndb_alter_table.result 2005-06-13 16:50:06 +02:00
@@ -180,6 +180,11 @@
alter table t1 drop index c;
select * from t1 where b = 'two';
ERROR HY000: Table definition has changed, please retry transaction
+show warnings;
+Level Code Message
+Error 1296 Got error 284 'Table not defined in transaction coordinator' from NDB
+Error 1412 Table definition has changed, please retry transaction
+Error 1105 Unknown error
select * from t1 where b = 'two';
a b c
2 two two
--- 1.21/mysql-test/t/ndb_alter_table.test 2005-04-21 10:24:37 +02:00
+++ 1.22/mysql-test/t/ndb_alter_table.test 2005-06-13 16:50:07 +02:00
@@ -150,6 +150,7 @@
connection server2;
--error 1412
select * from t1 where b = 'two';
+show warnings;
select * from t1 where b = 'two';
connection server1;
drop table t1;
--- 1.277/sql/ha_ndbcluster.cc 2005-06-13 12:33:18 +02:00
+++ 1.278/sql/ha_ndbcluster.cc 2005-06-13 16:50:07 +02:00
@@ -258,44 +258,7 @@
Error handling functions
*/
-#if 0 /* old mapping table, moved to storage/ndb/ndberror.c */
-struct err_code_mapping
-{
- int ndb_err;
- int my_err;
- int show_warning;
-};
-
-static const err_code_mapping err_map[]=
-{
- { 626, HA_ERR_KEY_NOT_FOUND, 0 },
- { 630, HA_ERR_FOUND_DUPP_KEY, 0 },
- { 893, HA_ERR_FOUND_DUPP_KEY, 0 },
- { 721, HA_ERR_TABLE_EXIST, 1 },
- { 4244, HA_ERR_TABLE_EXIST, 1 },
-
- { 709, HA_ERR_NO_SUCH_TABLE, 0 },
-
- { 266, HA_ERR_LOCK_WAIT_TIMEOUT, 1 },
- { 274, HA_ERR_LOCK_WAIT_TIMEOUT, 1 },
- { 296, HA_ERR_LOCK_WAIT_TIMEOUT, 1 },
- { 297, HA_ERR_LOCK_WAIT_TIMEOUT, 1 },
- { 237, HA_ERR_LOCK_WAIT_TIMEOUT, 1 },
-
- { 623, HA_ERR_RECORD_FILE_FULL, 1 },
- { 624, HA_ERR_RECORD_FILE_FULL, 1 },
- { 625, HA_ERR_RECORD_FILE_FULL, 1 },
- { 826, HA_ERR_RECORD_FILE_FULL, 1 },
- { 827, HA_ERR_RECORD_FILE_FULL, 1 },
- { 832, HA_ERR_RECORD_FILE_FULL, 1 },
-
- { 284, HA_ERR_TABLE_DEF_CHANGED, 0 },
-
- { 0, 1, 0 },
-
- { -1, -1, 1 }
-};
-#endif
+/* Note for merge: old mapping table, moved to storage/ndb/ndberror.c */
static int ndb_to_mysql_error(const NdbError *ndberr)
{
@@ -306,7 +269,6 @@
{
/* errors for which we do not add warnings, just return mapped error code */
case HA_ERR_NO_SUCH_TABLE:
- case HA_ERR_TABLE_DEF_CHANGED:
case HA_ERR_KEY_NOT_FOUND:
case HA_ERR_FOUND_DUPP_KEY:
return error;
--- 1.2/mysql-test/r/ndb_bitfield.result 2005-01-07 11:54:43 +01:00
+++ 1.3/mysql-test/r/ndb_bitfield.result 2005-06-13 16:50:07 +02:00
@@ -143,10 +143,18 @@
pk1 bit(9) not null primary key,
b int
) engine=ndbcluster;
-ERROR HY000: Can't create table './test/t1.frm' (errno: 739)
+ERROR HY000: Can't create table './test/t1.frm' (errno: 140)
+show warnings;
+Level Code Message
+Error 1296 Got error 739 'Unsupported primary key length' from NDB
+Error 1005 Can't create table './test/t1.frm' (errno: 140)
create table t1 (
pk1 int not null primary key,
b bit(9),
key(b)
) engine=ndbcluster;
-ERROR HY000: Can't create table './test/t1.frm' (errno: 743)
+ERROR HY000: Can't create table './test/t1.frm' (errno: 140)
+show warnings;
+Level Code Message
+Error 1296 Got error 743 'Unsupported character set in table or index' from NDB
+Error 1005 Can't create table './test/t1.frm' (errno: 140)
--- 1.3/mysql-test/r/ndb_multi.result 2005-04-27 18:17:18 +02:00
+++ 1.4/mysql-test/r/ndb_multi.result 2005-06-13 16:50:07 +02:00
@@ -29,7 +29,12 @@
create table t1 (a int) engine=ndbcluster;
insert into t1 value (2);
select * from t1;
-ERROR HY000: Got error 241 'Invalid schema object version' from ndbcluster
+ERROR HY000: Table definition has changed, please retry transaction
+show warnings;
+Level Code Message
+Error 1296 Got error 241 'Invalid schema object version' from NDB
+Error 1412 Table definition has changed, please retry transaction
+Error 1105 Unknown error
select * from t1;
a
2
--- 1.2/mysql-test/t/ndb_bitfield.test 2005-04-21 11:11:17 +02:00
+++ 1.3/mysql-test/t/ndb_bitfield.test 2005-06-13 16:50:07 +02:00
@@ -52,6 +52,7 @@
pk1 bit(9) not null primary key,
b int
) engine=ndbcluster;
+show warnings;
--error 1005
create table t1 (
@@ -59,4 +60,4 @@
b bit(9),
key(b)
) engine=ndbcluster;
-
+show warnings;
--- 1.4/mysql-test/t/ndb_multi.test 2005-04-27 18:17:18 +02:00
+++ 1.5/mysql-test/t/ndb_multi.test 2005-06-13 16:50:07 +02:00
@@ -38,8 +38,9 @@
insert into t1 value (2);
connection server1;
# Currently a retry is required remotely
---error 1296
+--error 1412
select * from t1;
+show warnings;
select * from t1;
# Connect to server2 and use the tables from there
--- 1.43/storage/ndb/src/ndbapi/ndberror.c 2005-06-13 12:33:18 +02:00
+++ 1.44/storage/ndb/src/ndbapi/ndberror.c 2005-06-13 16:50:07 +02:00
@@ -344,16 +344,16 @@
{ 721, HA_ERR_TABLE_EXIST, OE, "Table or index with given name already exists" },
{ 723, DMEC, SE, "No such table existed" },
{ 736, DMEC, SE, "Unsupported array size" },
- { 737, DMEC, SE, "Attribute array size too big" },
- { 738, DMEC, SE, "Record too big" },
- { 739, DMEC, SE, "Unsupported primary key length" },
- { 740, DMEC, SE, "Nullable primary key not supported" },
+ { 737, HA_WRONG_CREATE_OPTION, SE, "Attribute array size too big" },
+ { 738, HA_WRONG_CREATE_OPTION, SE, "Record too big" },
+ { 739, HA_WRONG_CREATE_OPTION, SE, "Unsupported primary key length" },
+ { 740, HA_WRONG_CREATE_OPTION, SE, "Nullable primary key not supported" },
{ 741, DMEC, SE, "Unsupported alter table" },
- { 743, DMEC, SE, "Unsupported character set in table or index" },
+ { 743, HA_WRONG_CREATE_OPTION, SE, "Unsupported character set in table or index" },
{ 744, DMEC, SE, "Character string is invalid for given character set" },
- { 745, DMEC, SE, "Distribution key not supported for char attribute (use binary attribute)" },
- { 241, DMEC, SE, "Invalid schema object version" },
- { 283, DMEC, SE, "Table is being dropped" },
+ { 745, HA_WRONG_CREATE_OPTION, SE, "Distribution key not supported for char attribute (use binary attribute)" },
+ { 241, HA_ERR_TABLE_DEF_CHANGED, SE, "Invalid schema object version" },
+ { 283, HA_ERR_NO_SUCH_TABLE, SE, "Table is being dropped" },
{ 284, HA_ERR_TABLE_DEF_CHANGED, SE, "Table not defined in transaction coordinator" },
{ 285, DMEC, SE, "Unknown table error in transaction coordinator" },
{ 881, DMEC, SE, "Unable to create table, out of data pages (increase DataMemory) " },
--- 1.6/mysql-test/t/rpl_ndb_idempotent.test 2005-06-01 07:06:58 +02:00
+++ 1.7/mysql-test/t/rpl_ndb_idempotent.test 2005-06-13 16:50:07 +02:00
@@ -38,7 +38,8 @@
SELECT * FROM t1 ORDER BY c3;
# check that we have it on the slave
-sync_slave_with_master;
+--sync_slave_with_master
+--connection slave
SELECT * FROM t1 ORDER BY c3;
--replace_result $MASTER_MYPORT MASTER_PORT
@@ -63,10 +64,10 @@
# updating a row which is not there
START SLAVE;
-connection master;
+--connection master
SELECT * FROM t1 ORDER BY c3;
-sync_slave_with_master;
-connection slave;
+--sync_slave_with_master
+--connection slave
SELECT * FROM t1 ORDER BY c3;
STOP SLAVE;
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1957) | tomas | 13 Jun |
