diff options
author | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-01 13:22:52 +0300 |
---|---|---|
committer | unknown <aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi> | 2007-06-01 13:22:52 +0300 |
commit | 4bdbc3396ea4335ed1f6d01afe4f557b57b183a3 (patch) | |
tree | 2f4dd30394a624370cfe07bfc88e6923a90ab697 /mysql-test/r/sp-vars.result | |
parent | eb056fb82b7593201ae01ef68c86dbbb54a498d5 (diff) | |
parent | 6b94fc579fdf3ddf4905a5b2c3c9e76d445f1304 (diff) | |
download | mariadb-git-4bdbc3396ea4335ed1f6d01afe4f557b57b183a3.tar.gz |
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27716-multi_upd_no_binlog
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/sp-vars.result')
0 files changed, 0 insertions, 0 deletions