diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-02-15 17:49:05 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-02-15 17:49:05 +0100 |
| commit | 51cd734d8a5466823de37b7d7c682bd58fa16817 (patch) | |
| tree | 4a0183d0989d27a9ad1226df52f45cf0c8a9532c /tests | |
| parent | e05e6814fb2b48efccc9336252dc72f550a67169 (diff) | |
| parent | e6a063cfd816e05958fa5f1bebd950d520493cf7 (diff) | |
| download | mariadb-git-51cd734d8a5466823de37b7d7c682bd58fa16817.tar.gz | |
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
sql/sql_delete.cc:
Auto merged
sql/sql_update.cc:
Auto merged
BitKeeper/deleted/.del-rpl_variables.test:
Manual merge.
mysql-test/r/multi_update.result:
Manual merge.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
Manual merge.
sql/slave.cc:
Manual merge.
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions