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@stripped, 2007-09-12 20:51:01+02:00, tomas@stripped +3 -0
WL#3867 Cluster conflict resolution phase 1
- change status variable name
mysql-test/suite/ndb/r/ndb_basic.result@stripped, 2007-09-12 20:50:58+02:00, tomas@stripped +1 -1
WL#3867 Cluster conflict resolution phase 1
- change status variable name
mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result@stripped, 2007-09-12 20:50:58+02:00, tomas@stripped +18 -18
WL#3867 Cluster conflict resolution phase 1
- change status variable name
sql/ha_ndbcluster.cc@stripped, 2007-09-12 20:50:58+02:00, tomas@stripped +3 -3
WL#3867 Cluster conflict resolution phase 1
- change status variable name
diff -Nrup a/mysql-test/suite/ndb/r/ndb_basic.result b/mysql-test/suite/ndb/r/ndb_basic.result
--- a/mysql-test/suite/ndb/r/ndb_basic.result 2007-09-12 19:47:51 +02:00
+++ b/mysql-test/suite/ndb/r/ndb_basic.result 2007-09-12 20:50:58 +02:00
@@ -13,7 +13,7 @@ Ndb_cluster_node_id #
Ndb_config_from_host #
Ndb_config_from_port #
Ndb_number_of_data_nodes #
-Ndb_conflict_max #
+Ndb_conflict_fn_max #
SHOW GLOBAL VARIABLES LIKE 'ndb%';
Variable_name Value
ndb_autoincrement_prefetch_sz #
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result 2007-09-12 16:23:37 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_conflict.result 2007-09-12 20:50:58 +02:00
@@ -16,9 +16,9 @@ insert into t2 values (1, "Master t2 a=1
insert into t2 values (2, "Master t2 a=2 at c=10", 10);
insert into t2 values (3, "Master t2 a=3 at c=10", 10);
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 0
+NDB_CONFLICT_FN_MAX 0
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=10 10
@@ -45,9 +45,9 @@ update t2 set b="Master t2 a=1 at c=11",
update t2 set b="Master t2 a=2 at c=11", c=11 where a=2;
update t2 set b="Master t2 a=3 at c=11", c=11 where a=3;
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 3
+NDB_CONFLICT_FN_MAX 3
select * from t1 order by a;
a b X
1 Slave t1 a=1 at X=12 12
@@ -66,9 +66,9 @@ update t2 set b="Master t2 a=1 at c=13",
update t2 set b="Master t2 a=2 at c=13", c=13 where a=2;
update t2 set b="Master t2 a=3 at c=13", c=13 where a=3;
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 3
+NDB_CONFLICT_FN_MAX 3
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=13 13
@@ -93,9 +93,9 @@ insert into t2 values (1, "Master t2 a=1
insert into t2 values (2, "Master t2 a=2 at c=10", 10);
insert into t2 values (3, "Master t2 a=3 at c=10", 10);
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 3
+NDB_CONFLICT_FN_MAX 3
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=10 10
@@ -122,9 +122,9 @@ update t2 set b="Master t2 a=1 at c=11",
update t2 set b="Master t2 a=2 at c=11", c=11 where a=2;
update t2 set b="Master t2 a=3 at c=11", c=11 where a=3;
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 6
+NDB_CONFLICT_FN_MAX 6
select * from t1 order by a;
a b X
1 Slave t1 a=1 at X=12 12
@@ -143,9 +143,9 @@ update t2 set b="Master t2 a=1 at c=13",
update t2 set b="Master t2 a=2 at c=13", c=13 where a=2;
update t2 set b="Master t2 a=3 at c=13", c=13 where a=3;
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 6
+NDB_CONFLICT_FN_MAX 6
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=13 13
@@ -170,9 +170,9 @@ insert into t2 values (1, "Master t2 a=1
insert into t2 values (2, "Master t2 a=2 at c=10", 10);
insert into t2 values (3, "Master t2 a=3 at c=10", 10);
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 6
+NDB_CONFLICT_FN_MAX 6
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=10 10
@@ -199,9 +199,9 @@ update t2 set b="Master t2 a=1 at c=11",
update t2 set b="Master t2 a=2 at c=11", c=11 where a=2;
update t2 set b="Master t2 a=3 at c=11", c=11 where a=3;
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 6
+NDB_CONFLICT_FN_MAX 6
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=11 11
@@ -220,9 +220,9 @@ update t2 set b="Master t2 a=1 at c=13",
update t2 set b="Master t2 a=2 at c=13", c=13 where a=2;
update t2 set b="Master t2 a=3 at c=13", c=13 where a=3;
commit;
-SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_MAX";
+SELECT * FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME="NDB_CONFLICT_FN_MAX";
VARIABLE_NAME VARIABLE_VALUE
-NDB_CONFLICT_MAX 6
+NDB_CONFLICT_FN_MAX 6
select * from t1 order by a;
a b X
1 Master t1 a=1 at X=13 13
diff -Nrup a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
--- a/sql/ha_ndbcluster.cc 2007-09-12 16:24:15 +02:00
+++ b/sql/ha_ndbcluster.cc 2007-09-12 20:50:58 +02:00
@@ -192,7 +192,7 @@ struct st_ndb_status {
};
static struct st_ndb_status g_ndb_status;
-static long g_ndb_status_conflict_max= 0;
+static long g_ndb_status_conflict_fn_max= 0;
static int update_status_variables(st_ndb_status *ns, Ndb_cluster_connection *c)
{
@@ -223,7 +223,7 @@ SHOW_VAR ndb_status_variables[]= {
};
SHOW_VAR ndb_status_conflict_variables[]= {
- {"conflict_max", (char*) &g_ndb_status_conflict_max, SHOW_LONG},
+ {"conflict_fn_max", (char*) &g_ndb_status_conflict_fn_max, SHOW_LONG},
{NullS, NullS, SHOW_LONG}
};
@@ -286,7 +286,7 @@ check_completed_operations(NdbTransactio
err.classification != NdbError::NoDataFound)
{
if (err.code == 9999)
- g_ndb_status_conflict_max++;
+ g_ndb_status_conflict_fn_max++;
else
DBUG_RETURN(err.code);
}
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.2593) | tomas | 12 Sep |
