diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
| commit | 72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1 (patch) | |
| tree | 220c965bb467b020a4db171d7803586f9ed22cea /mysql-test/r/variables.result | |
| parent | cfbd9270243e4b429cdc26e8554bcc99690f2422 (diff) | |
| parent | 00a2f36bbf22a4d8b2367724e7919c0603cf6f71 (diff) | |
| download | mariadb-git-72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1.tar.gz | |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to 'mysql-test/r/variables.result')
| -rw-r--r-- | mysql-test/r/variables.result | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 54506a9a4a2..832c679f8d5 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -576,7 +576,7 @@ set global table_open_cache=100; set storage_engine=myisam; set global thread_cache_size=100; set timestamp=1, timestamp=default; -set tmp_table_size=100; +set tmp_table_size=1024; set tx_isolation="READ-COMMITTED"; set wait_timeout=100; set log_warnings=1; @@ -1017,6 +1017,13 @@ hostname # # Test 'myisam_mmap_size' option is not dynamic SET @@myisam_mmap_size= 500M; ERROR HY000: Variable 'myisam_mmap_size' is a read only variable +# +# Bug #52315: utc_date() crashes when system time > year 2037 +# +SET TIMESTAMP=2*1024*1024*1024; +#Should not crash +SELECT UTC_DATE(); +SET TIMESTAMP=DEFAULT; End of 5.0 tests set join_buffer_size=1; Warnings: |