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 | 6d9d64baab8537e465659daab77d2a9fd1a286ff (patch) | |
tree | ce446d2a642cfd3838c2a928a265568cd482c9be /sql/rpl_rli.h | |
parent | ec9b5eca9cee569eb4c1442cb0ab47c72dac818d (diff) | |
parent | 2e302abc80ea82ba145289fb6951ccbbf51076b6 (diff) | |
download | mariadb-git-6d9d64baab8537e465659daab77d2a9fd1a286ff.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/rpl_rli.h')
0 files changed, 0 insertions, 0 deletions