summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.(none)>2007-06-01 18:11:21 +0400
committerunknown <kostja@bodhi.(none)>2007-06-01 18:11:21 +0400
commit3df461e5e1b1b3f88940878ceab0cb35e8da4812 (patch)
tree00fc6e524cbd4a51a5cbb250dc5a2506462bf08b /sql
parent82047fab57573e187892663adbf23d384b06bc25 (diff)
parenta00e5c6896e4a2d128aa7da5fabcb508ebd67f0f (diff)
downloadmariadb-git-3df461e5e1b1b3f88940878ceab0cb35e8da4812.tar.gz
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime BitKeeper/etc/ignore: auto-union mysql-test/t/rpl_loaddata.test: Use local. mysql-test/r/rpl_loaddata.result: Use local.
Diffstat (limited to 'sql')
0 files changed, 0 insertions, 0 deletions