diff options
| author | Alexander Barkov <bar@mariadb.org> | 2013-08-12 17:33:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2013-08-12 17:33:08 +0400 |
| commit | b59738a598569ace75be5e63b7ed6ca69afe6ebc (patch) | |
| tree | fe782f022937068aaab4d4b18171acc5d7533023 /client | |
| parent | b718dc449bfc6aa5756a316d4db8853918765619 (diff) | |
| parent | f1b4718ec894664df221704bb70fed80bdc14070 (diff) | |
| download | mariadb-git-b59738a598569ace75be5e63b7ed6ca69afe6ebc.tar.gz | |
Merge from 5.3
modified:
mysql-test/r/dyncol.result
mysql-test/r/type_time.result
mysql-test/t/dyncol.test
mysql-test/t/type_time.test
mysys/ma_dyncol.c
sql/item.cc
sql/item_func.cc
pending merges:
Alexander Barkov 2013-08-12 MDEV-4652 Wrong result for CONCAT(GREATEST(T...
sanja@montyprogr... 2013-08-01 MDEV-4811 Assertion `offset < 0x1f' f...
Diffstat (limited to 'client')
0 files changed, 0 insertions, 0 deletions