summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorunknown <gshchepa/uchum@gleb.loc>2007-06-24 03:35:27 +0500
committerunknown <gshchepa/uchum@gleb.loc>2007-06-24 03:35:27 +0500
commit26b526dc608ffb16e46729de6638d1ee9d668907 (patch)
treed8246af6017c853cb8d2e86ed1cc7972bf2bd9ea /debian
parentfdbefa8d528faf8e1d99d251c23c8a77f14b1aa2 (diff)
parentd37471b4ef931a0b945e20753203dbc3a266bcd5 (diff)
downloadmariadb-git-26b526dc608ffb16e46729de6638d1ee9d668907.tar.gz
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt libmysql/libmysql.c: Merge with 5.0-opt. mysql-test/r/insert_select.result: Merge with 5.0-opt. mysql-test/r/mysqlbinlog.result: Merge with 5.0-opt. mysql-test/r/rpl_change_master.result: Merge with 5.0-opt. mysql-test/r/view.result: Merge with 5.0-opt. mysql-test/t/insert_select.test: Merge with 5.0-opt. mysql-test/t/mysqlbinlog.test: Merge with 5.0-opt. mysql-test/t/rpl_change_master.test: Merge with 5.0-opt. mysql-test/t/view.test: Merge with 5.0-opt. sql/item.cc: Merge with 5.0-opt. sql/item.h: Merge with 5.0-opt. sql/log_event.cc: Merge with 5.0-opt. sql/sql_select.cc: Merge with 5.0-opt.
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions