diff options
author | unknown <timour/timka@lamia.home> | 2006-09-13 15:24:06 +0300 |
---|---|---|
committer | unknown <timour/timka@lamia.home> | 2006-09-13 15:24:06 +0300 |
commit | a1c85e65f0615c57f30d3c20fbdaeb60679ff9bb (patch) | |
tree | 8f02ee23dfe417cd983e0b773685472e8731acc9 /mysql-test/r/slave-running.result | |
parent | 2214e282a3f37419aeb791350e461b07662845b8 (diff) | |
parent | 900e66f89567d740c4290963825206ac8a672df8 (diff) | |
download | mariadb-git-a1c85e65f0615c57f30d3c20fbdaeb60679ff9bb.tar.gz |
Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm
into lamia.home:/home/timka/mysql/src/5.0-dbg
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/slave-running.result')
0 files changed, 0 insertions, 0 deletions