diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-08-10 16:23:26 -0700 |
| commit | 5a71e6bd5a61dff6d549d2c4f5927bbbd7ebcfee (patch) | |
| tree | 98ca05164f4a2bf2fce6e1644bc6335193e69bbd /mysql-test/r/commit_1innodb.result | |
| parent | 1710dd2bf286f9a240f380925a0067c57c1b29f9 (diff) | |
| parent | bf75dcac89d1496032015526dc6ce78d327e329f (diff) | |
| download | mariadb-git-bb-10-ext-mdev-13369.tar.gz | |
Merge branch 'bb-10.2-ext' into bb-10-ext-mdev-13369bb-10-ext-mdev-13369
# Conflicts:
# mysql-test/r/derived_cond_pushdown.result
# mysql-test/t/derived_cond_pushdown.test
# sql/sql_derived.cc
# sql/sql_select.cc
# sql/sql_select.h
Diffstat (limited to 'mysql-test/r/commit_1innodb.result')
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index 61274fa9049..258926e8c4b 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -230,7 +230,7 @@ insert into t2 (a) values (1023); do (f2(23)); Warnings: Error 1062 Duplicate entry '23' for key 'a' -Note 4070 At line 4 in test.f2 +Note 4091 At line 4 in test.f2 select * from t2; a 1023 |