diff options
author | unknown <mtaylor@qualinost.(none)> | 2006-12-14 12:21:37 -0800 |
---|---|---|
committer | unknown <mtaylor@qualinost.(none)> | 2006-12-14 12:21:37 -0800 |
commit | 8f5954378b90962afe7a17d6bdfee7f33850efa2 (patch) | |
tree | aab1a3ec39442ec48f89de815479e266998e76f2 /mysql-test/r | |
parent | de55066a368572f9a4de7653bc61b2144a9d448a (diff) | |
parent | b6eaf8cb2c4471f3d492f75ad75d50042a3ca32b (diff) | |
download | mariadb-git-8f5954378b90962afe7a17d6bdfee7f33850efa2.tar.gz |
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
scripts/mysqld_safe.sh:
Auto merged
Diffstat (limited to 'mysql-test/r')
0 files changed, 0 insertions, 0 deletions