diff options
author | unknown <mhansson@dl145s.mysql.com> | 2007-05-22 09:54:04 +0200 |
---|---|---|
committer | unknown <mhansson@dl145s.mysql.com> | 2007-05-22 09:54:04 +0200 |
commit | 6ae6d268922d426562fa67e9e738a5a4ba9f7212 (patch) | |
tree | 9e871beaa5722630ad2f3699647ef0dda8468d60 /mysql-test/r/myisam.result | |
parent | 1004132dc2c68fc75e4a068e65e303c05f1ca043 (diff) | |
parent | ab267d33ffcde14acf7791638329122f66591bc7 (diff) | |
download | mariadb-git-6ae6d268922d426562fa67e9e738a5a4ba9f7212.tar.gz |
Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/my51-bug23856
into dl145s.mysql.com:/users/mhansson/mysql/push/bug23856/mysql-5.1o-pushee
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/func_gconcat.result:
Bug#23856: Manually merged test case.
mysql-test/t/func_gconcat.test:
Bug#23856: Manually merged test case.
Diffstat (limited to 'mysql-test/r/myisam.result')
0 files changed, 0 insertions, 0 deletions