diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:09:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:27:04 +0200 |
| commit | 349560d5d5e53966fe75eef2bfefd12e29278f6a (patch) | |
| tree | ca1f26f2a2db1c8e2c86b8cbaae00abcebe5f6cf /storage/myisammrg | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| parent | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (diff) | |
| download | mariadb-git-349560d5d5e53966fe75eef2bfefd12e29278f6a.tar.gz | |
Merge 10.2 into 10.3
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 |