diff options
author | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-12-06 17:16:35 +0200 |
commit | 8a2514ba3f3d49bd338d4f079bef8ab39f6e8bbb (patch) | |
tree | 5cfc0009e76810724a4db2904e75e2db2506bd46 /mysql-test/r/mysqldump.result | |
parent | c5a287fbf879490de6c66b6fdae41108f156b420 (diff) | |
parent | 7bd0e1a439b1987455d7a77c5a6581867fe10ff7 (diff) | |
download | mariadb-git-8a2514ba3f3d49bd338d4f079bef8ab39f6e8bbb.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqldump.result')
0 files changed, 0 insertions, 0 deletions