diff options
author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-09-23 06:00:50 +0200 |
---|---|---|
committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-09-23 06:00:50 +0200 |
commit | 2bfeecca15d4301522b7c38250c1dfe30e039f3b (patch) | |
tree | 153d9f3b758d2b001c8b5770d23422cc6e91ad37 /config | |
parent | fcd21bd4ad5b1837ab292880bf113894488b45bb (diff) | |
parent | 9de027bdd54c84f0037f123e815e8628029261c5 (diff) | |
download | mariadb-git-2bfeecca15d4301522b7c38250c1dfe30e039f3b.tar.gz |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'config')
0 files changed, 0 insertions, 0 deletions