mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.1 into 10.2

Browse source
This commit is contained in:
Marko Mäkelä 2019-03-27 12:26:11 +02:00
commit 1e9c2b2305
39 changed files with 478 additions and 422 deletions
Download patch file Download diff file Expand all files Collapse all files

16
storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
View file

@ -10,8 +10,8 @@
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1;
-a b
-1 2
@ -27,8 +27,8 @@
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1;
-a b
-1 2
@ -44,8 +44,8 @@
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1;
-a b
-1 2
@ -61,8 +61,8 @@
-INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings:
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for generated column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1;
-a b
-1 2