diff options
| author | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-29 15:00:12 +0200 |
|---|---|---|
| committer | unknown <aelkin/andrei@mysql1000.(none)> | 2008-03-29 15:00:12 +0200 |
| commit | 9e57c988d2df7cff1e162728d7cb215aba7422d1 (patch) | |
| tree | b69f6a865d08077895e9ab32d8392e140da59380 /sql/mysql_priv.h | |
| parent | 1f5c4861d129a84425e0150559afb82315ea76c9 (diff) | |
| parent | efb9a7a0d4a82c732e49d81dd954540a1cba0d02 (diff) | |
| download | mariadb-git-9e57c988d2df7cff1e162728d7cb215aba7422d1.tar.gz | |
Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl
into mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
BitKeeper/deleted/.del-binlog_killed_simulate.result:
Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_user.result:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
BitKeeper/deleted/.del-show_binary_logs.inc:
Delete: mysql-test/include/show_binary_logs.inc
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
manual merge ul.
mysql-test/extra/binlog_tests/blackhole.test:
manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
manual merge
sql/log.cc:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_class.cc:
manual merge
Diffstat (limited to 'sql/mysql_priv.h')
0 files changed, 0 insertions, 0 deletions