Skip to content

M
MariaDB
Commit 865243bf authored by unknown's avatar unknown
Browse files
Options

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  manual merge
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  manual merge
parents 15cc254c dad3e3f6
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 24 deletions
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
View file @ 865243bf
...@@ -973,14 +973,7 @@ SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; ...@@ -973,14 +973,7 @@ SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
--echo --echo
--echo ** update from master ** --echo ** update from master **
connection master; connection master;
####################################### UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
# This test should be uncommented
# once bug30674 is patched
#######################################
#***************************
#UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
#***************************
--replace_column 5 CURRENT_TIMESTAMP --replace_column 5 CURRENT_TIMESTAMP
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
......
mysql-test/suite/ndb/r/ndb_blob.result
View file @ 865243bf
...@@ -568,3 +568,24 @@ select count(*) from t1; ...@@ -568,3 +568,24 @@ select count(*) from t1;
count(*) count(*)
0 0
drop table t1; drop table t1;
create table t1(
a int,
blob_nn blob not null,
text_nn text not null,
blob_nl blob,
text_nl text,
primary key(a)
) engine=ndb;
insert into t1(a) values (1);
Warnings:
Warning 1364 Field 'blob_nn' doesn't have a default value
Warning 1364 Field 'text_nn' doesn't have a default value
insert into t1(a, text_nl) values (2, 'MySQL Cluster NDB');
Warnings:
Warning 1364 Field 'blob_nn' doesn't have a default value
Warning 1364 Field 'text_nn' doesn't have a default value
select a, length(blob_nn), length(text_nn), blob_nl, text_nl from t1 order by a;
a length(blob_nn) length(text_nn) blob_nl text_nl
1 0 0 NULL NULL
2 0 0 NULL MySQL Cluster NDB
drop table t1;
mysql-test/suite/ndb/t/ndb_blob.test
View file @ 865243bf
...@@ -497,3 +497,23 @@ select count(*) from t1; ...@@ -497,3 +497,23 @@ select count(*) from t1;
drop table t1; drop table t1;
# End of 4.1 tests # End of 4.1 tests
# bug # 30674 :
# NOT NULL Blobs should default to zero-length. Not NULL TEXT
# should default to zero-chars
create table t1(
a int,
blob_nn blob not null,
text_nn text not null,
blob_nl blob,
text_nl text,
primary key(a)
) engine=ndb;
insert into t1(a) values (1);
insert into t1(a, text_nl) values (2, 'MySQL Cluster NDB');
select a, length(blob_nn), length(text_nn), blob_nl, text_nl from t1 order by a;
drop table t1;
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
View file @ 865243bf
...@@ -1089,18 +1089,19 @@ c1 hex(c4) c5 ...@@ -1089,18 +1089,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
...@@ -2229,18 +2230,19 @@ c1 hex(c4) c5 ...@@ -2229,18 +2230,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
...@@ -3369,18 +3371,19 @@ c1 hex(c4) c5 ...@@ -3369,18 +3371,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
......
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
View file @ 865243bf
...@@ -1089,18 +1089,19 @@ c1 hex(c4) c5 ...@@ -1089,18 +1089,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
...@@ -2229,18 +2230,19 @@ c1 hex(c4) c5 ...@@ -2229,18 +2230,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
...@@ -3369,18 +3371,19 @@ c1 hex(c4) c5 ...@@ -3369,18 +3371,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
......
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result
View file @ 865243bf
...@@ -1089,18 +1089,19 @@ c1 hex(c4) c5 ...@@ -1089,18 +1089,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
...@@ -2229,18 +2230,19 @@ c1 hex(c4) c5 ...@@ -2229,18 +2230,19 @@ c1 hex(c4) c5
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 QA
** update from master ** ** update from master **
UPDATE t18 SET c5 = 'TEST' WHERE c6 = 3;
SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5,c6,c7 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c6 c7 c1 hex(c4) c5 c6 c7
1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP 1 62316231623162316231623162316231 Kyle 1 CURRENT_TIMESTAMP
2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP 2 62316231623162316231623162316231 JOE 2 CURRENT_TIMESTAMP
3 62316231623162316231623162316231 QA 3 CURRENT_TIMESTAMP 3 62316231623162316231623162316231 TEST 3 CURRENT_TIMESTAMP
** Check slave ** ** Check slave **
SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1; SELECT c1,hex(c4),c5 FROM t18 ORDER BY c1;
c1 hex(c4) c5 c1 hex(c4) c5
1 62316231623162316231623162316231 Kyle 1 62316231623162316231623162316231 Kyle
2 62316231623162316231623162316231 JOE 2 62316231623162316231623162316231 JOE
3 62316231623162316231623162316231 QA 3 62316231623162316231623162316231 TEST
DROP TABLE t18; DROP TABLE t18;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7