1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 5.5 into 10.0

This commit is contained in:
Marko Mäkelä
2019-03-26 14:13:46 +02:00
28 changed files with 423 additions and 371 deletions

View File

@ -7,8 +7,8 @@ b int(11) # # VIRTUAL
INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1;
a b
1 2
@ -24,8 +24,8 @@ b int(11) # # PERSISTENT
INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1;
a b
1 2
@ -41,8 +41,8 @@ b int(11) # # VIRTUAL
INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1;
a b
1 2
@ -58,8 +58,8 @@ b int(11) # # PERSISTENT
INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1;
a b
1 2