diff options
author | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-12 14:14:15 +0200 |
---|---|---|
committer | unknown <aelkin/elkin@koti.dsl.inet.fi> | 2007-11-12 14:14:15 +0200 |
commit | 296931c1c7db0f502da7ec34060e2ca5d86bddd3 (patch) | |
tree | 0fbcf8a39df2dcfaeb6fef42d19a0e35c27348de /sql/sql_update.cc | |
parent | e7c56ceb8b825b090b3fb1f0673835a5cdc5bcd6 (diff) | |
parent | dc34f9285f8a7dd23ce9c0ddc20cb7f23e1c3cf0 (diff) | |
download | mariadb-git-296931c1c7db0f502da7ec34060e2ca5d86bddd3.tar.gz |
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31170-rpl_innodb_bug28430_fails
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Auto merged
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
manual merge
Diffstat (limited to 'sql/sql_update.cc')
0 files changed, 0 insertions, 0 deletions