diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-14 09:49:35 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-14 09:49:35 +0100 |
| commit | d9d3f624932168fd2c46d9845a148effc087ff86 (patch) | |
| tree | 4b24e3ef68d9a65ab5f6793f28e3ac893d454091 /mysql-test/r/rpl_timezone.result | |
| parent | 94930f63c82f9a457d20064ba8f7219fd37c6aa6 (diff) | |
| parent | c21f4e6e4c1da4e7affdfd03de526c72983c612a (diff) | |
| download | mariadb-git-d9d3f624932168fd2c46d9845a148effc087ff86.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/collapsed:
auto-union
sql/item_func.cc:
Auto merged
mysql-test/Makefile.am:
Use local
Diffstat (limited to 'mysql-test/r/rpl_timezone.result')
0 files changed, 0 insertions, 0 deletions