diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 12:26:11 +0200 |
| commit | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (patch) | |
| tree | c40b137e083a5adccc139a844c0f8d085283fc32 /storage/myisammrg | |
| parent | c676f58c270d75b6c1889b24b9833afc65b0d98b (diff) | |
| parent | a6585d5ce99c2efdd75884b989250e2de8203cca (diff) | |
| download | mariadb-git-1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/mysql-test/storage_engine/vcol.rdiff | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff index d537967ef99..6c4971c63be 100644 --- a/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/vcol.rdiff @@ -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 |