diff options
| author | unknown <istruewing@stella.local> | 2008-03-20 12:22:02 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-20 12:22:02 +0100 |
| commit | 030318d824d427701bcab1e364abcec3b4ea6389 (patch) | |
| tree | 9f1fdb980aeaf04ddbe38892fad06750559fe761 /sql/rpl_rli.cc | |
| parent | eb9f258e18cdc40f715a471730fae455c02013d1 (diff) | |
| parent | ca629f8618f16d669e835b76f4ed5393beb640e6 (diff) | |
| download | mariadb-git-030318d824d427701bcab1e364abcec3b4ea6389.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.1-ateam
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/r/partition_not_windows.result:
Auto merged
mysql-test/r/partition_symlink.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/suite/parts/r/partition_basic_innodb.result:
Auto merged
mysql-test/suite/parts/r/partition_basic_myisam.result:
Auto merged
sql/log_event.cc:
Auto merged
sql/partition_info.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/partition_symlink.test:
Manual merge
mysql-test/t/symlink.test:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/rpl_rli.cc')
0 files changed, 0 insertions, 0 deletions