diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-05-28 00:22:44 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-05-28 00:22:44 +0500 |
| commit | a49eab93bc7d79ee0b339485ca1956a62af834c3 (patch) | |
| tree | d507b01c581dcd55bffd91939feeff21f51f64c2 /debian/mysql-server-BASE.logcheck.ignore.paranoid.in | |
| parent | 6b3d981d97917aecc0c1ef7d1533e39f17b7db31 (diff) | |
| parent | 63aa5e606bec989bfe3749997e883996bacb931d (diff) | |
| download | mariadb-git-a49eab93bc7d79ee0b339485ca1956a62af834c3.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/kill.test:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
mysql-test/r/mysqldump.result:
Merge with 5.0-opt
mysql-test/t/mysqldump.test:
Merge with 5.0-opt
mysql-test/t/view.test:
Merge with 5.0-opt
sql/sql_select.cc:
Merge with 5.0-opt
Diffstat (limited to 'debian/mysql-server-BASE.logcheck.ignore.paranoid.in')
0 files changed, 0 insertions, 0 deletions