Skip to content

Commit c6b07cf

Browse files
lkotulalkotula
committed
Merge branch 'mysql-8.0' into mysql-trunk
2 parents 744933b + d5322c0 commit c6b07cf

14 files changed

+33
-32
lines changed

‎mysql-test/suite/x/r/crud_insert_cast.result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ send Mysqlx.Crud.Insert {
427427
type: LITERAL
428428
literal {
429429
type: V_FLOAT
430-
v_float: 3.141593
430+
v_float: 3.14159
431431
}
432432
}
433433
param {
@@ -451,7 +451,7 @@ send Mysqlx.Crud.Insert {
451451
type: LITERAL
452452
literal {
453453
type: V_FLOAT
454-
v_float: 3.141593
454+
v_float: 3.14159
455455
}
456456
}
457457
param {
@@ -475,7 +475,7 @@ send Mysqlx.Crud.Insert {
475475
type: LITERAL
476476
literal {
477477
type: V_FLOAT
478-
v_float: 3.141593
478+
v_float: 3.14159
479479
}
480480
}
481481
param {
@@ -500,7 +500,7 @@ send Mysqlx.Crud.Insert {
500500
literal {
501501
type: V_OCTETS
502502
v_octets {
503-
value: "3.141593"
503+
value: "3.14159"
504504
}
505505
}
506506
}

‎mysql-test/suite/x/r/insert_table.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ send Mysqlx.Crud.Insert {
124124
type: LITERAL
125125
literal {
126126
type: V_FLOAT
127-
v_float: 0.33333334
127+
v_float: 0.333333
128128
}
129129
}
130130
field {
@@ -299,7 +299,7 @@ send Mysqlx.Crud.Insert {
299299
type: LITERAL
300300
literal {
301301
type: V_FLOAT
302-
v_float: 0.33333334
302+
v_float: 0.333333
303303
}
304304
}
305305
field {
@@ -406,7 +406,7 @@ send Mysqlx.Crud.Insert {
406406
type: LITERAL
407407
literal {
408408
type: V_FLOAT
409-
v_float: 0.33333334
409+
v_float: 0.333333
410410
}
411411
}
412412
field {

‎mysql-test/suite/x/r/insert_table_bad_column.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ send Mysqlx.Crud.Insert {
7575
type: LITERAL
7676
literal {
7777
type: V_FLOAT
78-
v_float: 0.33333334
78+
v_float: 0.333333
7979
}
8080
}
8181
field {

‎mysql-test/suite/x/r/insert_table_bad_column_type.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ send Mysqlx.Crud.Insert {
7575
type: LITERAL
7676
literal {
7777
type: V_FLOAT
78-
v_float: 0.33333334
78+
v_float: 0.333333
7979
}
8080
}
8181
field {
@@ -180,7 +180,7 @@ send Mysqlx.Crud.Insert {
180180
type: LITERAL
181181
literal {
182182
type: V_FLOAT
183-
v_float: 0.33333334
183+
v_float: 0.333333
184184
}
185185
}
186186
field {
@@ -287,7 +287,7 @@ send Mysqlx.Crud.Insert {
287287
type: LITERAL
288288
literal {
289289
type: V_FLOAT
290-
v_float: 0.33333334
290+
v_float: 0.333333
291291
}
292292
}
293293
field {

‎mysql-test/suite/x/r/insert_table_bad_numcolumns.result‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ send Mysqlx.Crud.Insert {
7575
type: LITERAL
7676
literal {
7777
type: V_FLOAT
78-
v_float: 0.33333334
78+
v_float: 0.333333
7979
}
8080
}
8181
field {
@@ -184,7 +184,7 @@ send Mysqlx.Crud.Insert {
184184
type: LITERAL
185185
literal {
186186
type: V_FLOAT
187-
v_float: 0.33333334
187+
v_float: 0.333333
188188
}
189189
}
190190
field {
@@ -282,7 +282,7 @@ send Mysqlx.Crud.Insert {
282282
type: LITERAL
283283
literal {
284284
type: V_FLOAT
285-
v_float: 0.33333334
285+
v_float: 0.333333
286286
}
287287
}
288288
field {

‎mysql-test/suite/x/r/update_crud_arrayappend_o.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ send Mysqlx.Crud.Update {
509509
type: LITERAL
510510
literal {
511511
type: V_FLOAT
512-
v_float: 78445.523
512+
v_float: 78445.5
513513
}
514514
}
515515
}

‎mysql-test/suite/x/r/update_crud_arrayinsert_o.result‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ send Mysqlx.Crud.Update {
591591
type: LITERAL
592592
literal {
593593
type: V_FLOAT
594-
v_float: 356.85941
594+
v_float: 356.859
595595
}
596596
}
597597
}

‎mysql-test/suite/x/t/crud_insert_cast.test‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ Mysqlx.Crud.Insert {
267267
name: "cast"
268268
param {
269269
type : LITERAL
270-
literal { type: V_FLOAT v_float: 3.141593 }
270+
literal { type: V_FLOAT v_float: 3.14159 }
271271
}
272272
param {
273273
type : LITERAL
@@ -282,7 +282,7 @@ Mysqlx.Crud.Insert {
282282
name: "cast"
283283
param {
284284
type : LITERAL
285-
literal { type: V_FLOAT v_float: 3.141593 }
285+
literal { type: V_FLOAT v_float: 3.14159 }
286286
}
287287
param {
288288
type : LITERAL
@@ -297,7 +297,7 @@ Mysqlx.Crud.Insert {
297297
name: "cast"
298298
param {
299299
type : LITERAL
300-
literal { type: V_FLOAT v_float: 3.141593 }
300+
literal { type: V_FLOAT v_float: 3.14159 }
301301
}
302302
param {
303303
type : LITERAL
@@ -312,7 +312,7 @@ Mysqlx.Crud.Insert {
312312
name: "cast"
313313
param {
314314
type : LITERAL
315-
literal { type: V_OCTETS v_octets {value:"3.141593"} }
315+
literal { type: V_OCTETS v_octets {value:"3.14159"} }
316316
}
317317
param {
318318
type : LITERAL

‎mysql-test/suite/x/t/insert_table.test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Mysqlx.Crud.Insert {
115115
type: LITERAL
116116
literal {
117117
type: V_FLOAT
118-
v_float: 0.333333333333
118+
v_float: 0.333333
119119
}
120120
}
121121
field {
@@ -287,7 +287,7 @@ Mysqlx.Crud.Insert {
287287
type: LITERAL
288288
literal {
289289
type: V_FLOAT
290-
v_float: 0.333333333333
290+
v_float: 0.333333
291291
}
292292
}
293293
field {
@@ -392,7 +392,7 @@ Mysqlx.Crud.Insert {
392392
type: LITERAL
393393
literal {
394394
type: V_FLOAT
395-
v_float: 0.333333333333
395+
v_float: 0.333333
396396
}
397397
}
398398
field {

‎mysql-test/suite/x/t/insert_table_bad_column.test‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ create table mycoll (doc JSON, _id VARBINARY(16) GENERATED ALWAYS AS (json_unquo
1414
create table mytable (i int NOT NULL, ui int unsigned, vc varchar(100), f float, d double, dt datetime, ts timestamp(5), j json);
1515
create table ` .'"````\\` (` .'"````\\` int);
1616
-->endsql
17+
1718
Mysqlx.Crud.Insert {
1819
collection {
1920
name: "mytable"
@@ -72,7 +73,7 @@ Mysqlx.Crud.Insert {
7273
type: LITERAL
7374
literal {
7475
type: V_FLOAT
75-
v_float: 0.333333333333
76+
v_float: 0.333333
7677
}
7778
}
7879
field {

0 commit comments

Comments
 (0)