diff options
| author | unknown <serg@janus.mylan> | 2007-04-10 15:27:26 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-04-10 15:27:26 +0200 |
| commit | c4879fe6dde9890496a6555e78fa9bde5e21f8f4 (patch) | |
| tree | 31122b0617cbed3f707ef8660b45a8baf4e10ba8 /mysql-test/r/mysqlbinlog.result | |
| parent | d75aa05538993927ccdba80641d092b319529bb5 (diff) | |
| parent | bceecfa820d0a27f02d9639606cc65bf8f77827f (diff) | |
| download | mariadb-git-c4879fe6dde9890496a6555e78fa9bde5e21f8f4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
heap/hp_write.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
0 files changed, 0 insertions, 0 deletions