Skip to content

Commit d55689e

Browse files
dssanjudssanju
committed
Merge branch 'mysql-5.6-cluster-7.3' into mysql-5.6-cluster-7.4
2 parents 4c96024 + 1c73a7a commit d55689e

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

‎mysql-test/suite/ndb/r/ndb_native_default_support.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ d Double NULL AT=FIXED ST=MEMORY DEFAULT 8.800000
153153
d2 Double NOT NULL AT=FIXED ST=MEMORY
154154
ch Char(19;latin1_swedish_ci) NULL AT=FIXED ST=MEMORY DEFAULT "aaa"
155155
vch Varchar(19;latin1_swedish_ci) NULL AT=SHORT_VAR ST=MEMORY DEFAULT "bbb"
156-
b Binary(19) NULL AT=FIXED ST=MEMORY DEFAULT 0x636363
156+
b Binary(19) NULL AT=FIXED ST=MEMORY DEFAULT 0x63636300000000000000000000000000000000
157157
vb Varbinary(19) NULL AT=SHORT_VAR ST=MEMORY DEFAULT 0x646464
158158
blob1 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_9
159159
text1 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_10
@@ -384,7 +384,7 @@ d Double NULL AT=FIXED ST=MEMORY DEFAULT 8.800000
384384
d2 Double NOT NULL AT=FIXED ST=MEMORY
385385
ch Char(19;latin1_swedish_ci) NULL AT=FIXED ST=MEMORY DEFAULT "aaa"
386386
vch Varchar(19;latin1_swedish_ci) NULL AT=SHORT_VAR ST=MEMORY DEFAULT "bbb"
387-
b Binary(19) NULL AT=FIXED ST=MEMORY DEFAULT 0x636363
387+
b Binary(19) NULL AT=FIXED ST=MEMORY DEFAULT 0x63636300000000000000000000000000000000
388388
vb Varbinary(19) NULL AT=SHORT_VAR ST=MEMORY DEFAULT 0x646464
389389
blob1 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_9
390390
text1 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_10
@@ -1470,7 +1470,7 @@ f Float NOT NULL AT=FIXED ST=MEMORY DEFAULT 6.600000
14701470
d Double NULL AT=FIXED ST=MEMORY DEFAULT 8.800000
14711471
d2 Double NOT NULL AT=FIXED ST=MEMORY
14721472
ch Char(19;latin1_swedish_ci) NULL AT=FIXED ST=MEMORY DEFAULT "aaaAAA"
1473-
b Binary(19) NULL AT=FIXED ST=MEMORY DEFAULT 0x636363
1473+
b Binary(19) NULL AT=FIXED ST=MEMORY DEFAULT 0x63636300000000000000000000000000000000
14741474
vb Varbinary(19) NULL AT=SHORT_VAR ST=MEMORY DEFAULT 0x646464
14751475
blob1 Blob(256,2000,0) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_8
14761476
text1 Text(256,2000,0;latin1_swedish_ci) NULL AT=MEDIUM_VAR ST=MEMORY BV=2 BT=NDB$BLOB_XX_9

‎mysql-test/suite/ndb/r/ndb_restore_print.result

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,11 @@ hex(h3) NULL
227227
hex(i1) NULL
228228
hex(i2) NULL
229229
hex(i3) NULL
230-
1;0x1;0x17;0x789A;0x789ABCDE;0xFEDC0001;127;255;32767;65535;2147483647;4294967295;9223372036854775807;18446744073709551615;1;12345678901234567890123456789012;123456789;1;12345678901234567890123456789012;123456789;0x12;0x123456789ABCDEF0;0x012345;0x12;0x123456789ABCDEF0;0x00123450
231-
2;0x0;0x0;0x0;0x0;0x0;-128;0;-32768;0;-2147483648;0;-9223372036854775808;0;;;;;;;0x0;0x0;0x0;0x0;0x0;0x0
230+
1;0x1;0x17;0x789A;0x789ABCDE;0xFEDC0001;127;255;32767;65535;2147483647;4294967295;9223372036854775807;18446744073709551615;1;12345678901234567890123456789012;123456789;1;12345678901234567890123456789012;123456789;0x12;0x123456789ABCDEF0;0x012345000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;0x12;0x123456789ABCDEF0;0x00123450
231+
2;0x0;0x0;0x0;0x0;0x0;-128;0;-32768;0;-2147483648;0;-9223372036854775808;0;;;;;;;0x00;0x0000000000000000;0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000;0x00;0x00;0x00
232232
3;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N;\N
233-
1,0x1,0x17,0x789A,0x789ABCDE,0xFEDC0001,127,255,32767,65535,2147483647,4294967295,9223372036854775807,18446744073709551615,'1','12345678901234567890123456789012','123456789','1','12345678901234567890123456789012','123456789',0x12,0x123456789ABCDEF0,0x012345,0x12,0x123456789ABCDEF0,0x00123450
234-
2,0x0,0x0,0x0,0x0,0x0,-128,0,-32768,0,-2147483648,0,-9223372036854775808,0,'','','','','','',0x0,0x0,0x0,0x0,0x0,0x0
233+
1,0x1,0x17,0x789A,0x789ABCDE,0xFEDC0001,127,255,32767,65535,2147483647,4294967295,9223372036854775807,18446744073709551615,'1','12345678901234567890123456789012','123456789','1','12345678901234567890123456789012','123456789',0x12,0x123456789ABCDEF0,0x012345000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,0x12,0x123456789ABCDEF0,0x00123450
234+
2,0x0,0x0,0x0,0x0,0x0,-128,0,-32768,0,-2147483648,0,-9223372036854775808,0,'','','','','','',0x00,0x0000000000000000,0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000,0x00,0x00,0x00
235235
3,,,,,,,,,,,,,,,,,,,,,,,,,
236236
drop table t1;
237237
create table t1
@@ -254,11 +254,11 @@ create table t4 (pk int key, a int) engine ndb;
254254
insert into t2 values (1,11),(2,12),(3,13),(4,14),(5,15);
255255
insert into t3 values (1,21),(2,22),(3,23),(4,24),(5,25);
256256
insert into t4 values (1,31),(2,32),(3,33),(4,34),(5,35);
257-
'1' '1' '12345678901234567890123456789012' '123456789' '1' '12345678901234567890123456789012' '123456789' '0x20' '0x123456789ABCDEF020' '0x012345000020' '0x1200000020' '0x123456789ABCDEF000000020' '0x00123450000020'
257+
'1' '1' '12345678901234567890123456789012' '123456789' '1' '12345678901234567890123456789012' '123456789' '0x20' '0x123456789ABCDEF020' '0x012345000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000' '0x1200000020' '0x123456789ABCDEF000000020' '0x00123450000020'
258258

259259
t1
260260
--
261-
1 1 12345678901234567890123456789012 123456789 1 12345678901234567890123456789012 123456789 0x20 0x123456789ABCDEF020 0x012345000020 0x1200000020 0x123456789ABCDEF000000020 0x00123450000020
261+
1 1 12345678901234567890123456789012 123456789 1 12345678901234567890123456789012 123456789 0x20 0x123456789ABCDEF020 0x012345000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 0x1200000020 0x123456789ABCDEF000000020 0x00123450000020
262262

263263
t2
264264
--

‎storage/ndb/src/ndbapi/NdbDictionary.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License as published by
@@ -3251,17 +3251,7 @@ pretty_print_string(NdbOut& out,
32513251
{
32523252
const unsigned char* ref = (const unsigned char*)aref;
32533253
int i, len, printable= 1;
3254-
// trailing zeroes are not printed
3255-
for (i=sz-1; i >= 0; i--)
3256-
if (ref[i] == 0) sz--;
3257-
else break;
3258-
if (!is_binary)
3259-
{
3260-
// trailing spaces are not printed
3261-
for (i=sz-1; i >= 0; i--)
3262-
if (ref[i] == 32) sz--;
3263-
else break;
3264-
}
3254+
32653255
if (is_binary && f.hex_format)
32663256
{
32673257
if (sz == 0)
@@ -3274,6 +3264,18 @@ pretty_print_string(NdbOut& out,
32743264
out.print("%02X", (int)ref[len]);
32753265
return;
32763266
}
3267+
3268+
// trailing zeroes are not printed
3269+
for (i=sz-1; i >= 0; i--)
3270+
if (ref[i] == 0) sz--;
3271+
else break;
3272+
if (!is_binary)
3273+
{
3274+
// trailing spaces are not printed
3275+
for (i=sz-1; i >= 0; i--)
3276+
if (ref[i] == 32) sz--;
3277+
else break;
3278+
}
32773279
if (sz == 0) return; // empty
32783280

32793281
// NOTE! This for loop both checks printable and counts length

0 commit comments

Comments
 (0)