diff options
author | unknown <bar@mysql.com> | 2007-04-09 18:06:27 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2007-04-09 18:06:27 +0500 |
commit | dd026adbecb6ff790a8f4c77a7b733a8d96bb687 (patch) | |
tree | ce446d2a642cfd3838c2a928a265568cd482c9be /sql/sql_repl.cc | |
parent | 9c2673816d0c8092233b2ca31a47214c6f3dcb0e (diff) | |
parent | e8aa8c3ceec08e543eaa6d34451f5c7a5618abf3 (diff) | |
download | mariadb-git-dd026adbecb6ff790a8f4c77a7b733a8d96bb687.tar.gz |
Merge mysql.com:/home/bar/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.1-new-rpl
client/mysql.cc:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/mysqld.cc:
SCCS merged
Diffstat (limited to 'sql/sql_repl.cc')
0 files changed, 0 insertions, 0 deletions