diff options
| author | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-06 18:14:54 +0200 |
| commit | b2f8d7b41001a5da11b2d99a055a207c3911a213 (patch) | |
| tree | d108ed6d1f38543305235fec6a63228a5a2f08d5 /mysql-test/t/func_str.test | |
| parent | d4b3a199acb0ddcdedff441ae664b0a2cf2fe8d2 (diff) | |
| parent | 07b8aefe90ca830d2de068f2966cd2288b158a88 (diff) | |
| download | mariadb-git-b2f8d7b41001a5da11b2d99a055a207c3911a213.tar.gz | |
Merge branch '10.1' into 10.2
Conflicts:
VERSION
cmake/plugin.cmake
config.h.cmake
configure.cmake
plugin/server_audit/server_audit.c
sql/sql_yacc.yy
Diffstat (limited to 'mysql-test/t/func_str.test')
| -rw-r--r-- | mysql-test/t/func_str.test | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test index 511f1f31736..2645417f3e5 100644 --- a/mysql-test/t/func_str.test +++ b/mysql-test/t/func_str.test @@ -1774,5 +1774,15 @@ SELECT * FROM t1 WHERE a=18446744073709551615 AND FORMAT(a,0)='18,446,744,073,70 DROP TABLE t1; --echo # +--echo # Bug#58081 Duplicate entry error when doing GROUP BY +--echo # MDEV-9332 Bug after upgrade to 10.1.10 +--echo # +SET NAMES latin1; +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (0),(0),(1),(0),(0); +SELECT COUNT(*) FROM t1, t1 t2 GROUP BY INSERT('', t2.a, t1.a, @@global.max_binlog_size); +DROP TABLE t1; + +--echo # --echo # End of 10.1 tests --echo # |