diff options
author | unknown <aivanov@mysql.com> | 2006-04-10 19:54:41 +0400 |
---|---|---|
committer | unknown <aivanov@mysql.com> | 2006-04-10 19:54:41 +0400 |
commit | ee72e2a55a09e9074bbecb0b18afb9db309383c9 (patch) | |
tree | 6e98b1581c786ae0ee47e1147e2ec1c5ce3621f2 /mysql-test | |
parent | e1d522da8b506aa2f6ba4272b9d898579ee46efb (diff) | |
parent | 7cb8b2a8dba2c5e5da01aec2623f83d913955c18 (diff) | |
download | mariadb-git-ee72e2a55a09e9074bbecb0b18afb9db309383c9.tar.gz |
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
into mysql.com:/home/alexi/bugs/mysql-5.1-15868
Null-merge
sql/mysqld.cc:
Null-merge.
Diffstat (limited to 'mysql-test')
0 files changed, 0 insertions, 0 deletions