diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-15 09:56:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-15 09:56:03 +0300 |
| commit | 84db10f27bdb4c8d9edf7f554afdcd2a24e3285a (patch) | |
| tree | 5f9d5b22cdfee6f147274d85b279d98f8a1bb46b /mysql-test/main/errors.result | |
| parent | 9aacda409db8606b985a93f675487943846cbc86 (diff) | |
| parent | ccaec18b3934ee384296b4597bdf462fac66c5a4 (diff) | |
| download | mariadb-git-84db10f27bdb4c8d9edf7f554afdcd2a24e3285a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/errors.result')
| -rw-r--r-- | mysql-test/main/errors.result | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/main/errors.result b/mysql-test/main/errors.result index ba05a2b37d4..78695b07b8e 100644 --- a/mysql-test/main/errors.result +++ b/mysql-test/main/errors.result @@ -170,10 +170,23 @@ UPDATE t1 SET a = 'new' WHERE COLUMN_CREATE( 1, 'v', 1, 'w' ) IS NULL; ERROR 22007: Illegal value used as argument of dynamic column function drop table t1; +set @max_session_mem_used_save= @@max_session_mem_used; set max_session_mem_used = 50000; select * from seq_1_to_1000; set max_session_mem_used = 8192; select * from seq_1_to_1000; +set max_session_mem_used = @max_session_mem_used_save; +# +# MDEV-20604: Duplicate key value is silently truncated to 64 +# characters in print_keydup_error +# +create table t1 (a varchar(100), UNIQUE KEY akey (a)); +insert into t1 values ("1234567890123456789012345678901234567890123456789012345678901234567890_end"); +# The value in the error message should show truncation with "..." +insert into t1 values ("1234567890123456789012345678901234567890123456789012345678901234567890_end"); +ERROR 23000: Duplicate entry '1234567890123456789012345678901234567890123456789012345678901...' for key 'akey' +drop table t1; +# End of 10.2 tests # # MDEV-14269 errors.test fails with valgrind (Conditional jump or move depends on uninitialised value) # @@ -182,3 +195,4 @@ SELECT UPDATEXML(-73 * -2465717823867977728,@@global.auto_increment_increment,nu ERROR 22003: BIGINT value is out of range in '-73 * -2465717823867977728' SELECT UPDATEXML(-73 * -2465717823867977728,@@global.long_query_time,null); ERROR 22003: BIGINT value is out of range in '-73 * -2465717823867977728' +# End of 10.3 tests |