diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-09-07 04:48:29 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-09-07 04:48:29 +0200 |
| commit | 4bc575334518b8375987f32915d6b5749cee9685 (patch) | |
| tree | c24da511665f837d812203c87c74e72515a2144e /mysql-test/t/xml.test | |
| parent | 0fbd21584ddece7e61c3124ffbaf8b474779062b (diff) | |
| parent | 452a885e1f68d2c3b364538ce9f81fd655bcf43f (diff) | |
| download | mariadb-git-4bc575334518b8375987f32915d6b5749cee9685.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/xml.test')
0 files changed, 0 insertions, 0 deletions