diff options
author | unknown <timour/timka@lamia.home> | 2006-09-13 15:22:50 +0300 |
---|---|---|
committer | unknown <timour/timka@lamia.home> | 2006-09-13 15:22:50 +0300 |
commit | 6a490444a615b9fd8ee057f71c215175cd6eb4cc (patch) | |
tree | 4292b4392f5f5b7332964eccf5e262408f1fb3ef /sql/sql_repl.h | |
parent | bc053aa0a1764220d3c0191f1293f78decfe7c4d (diff) | |
parent | 900e66f89567d740c4290963825206ac8a672df8 (diff) | |
download | mariadb-git-6a490444a615b9fd8ee057f71c215175cd6eb4cc.tar.gz |
Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm
into lamia.home:/home/timka/mysql/src/5.1-dbg
mysql-test/r/insert_select.result:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_repl.h')
0 files changed, 0 insertions, 0 deletions