diff options
| author | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
| commit | 7f6f31ae73674eb65f4881608b22c843efc23179 (patch) | |
| tree | 751108ce077ef66187d4c557a01975a26665d188 /mysql-test/r/rpl_rotate_logs.result | |
| parent | 21332fe0a0b510d7b5f5f171a41cbede1965c623 (diff) | |
| parent | ddc3586495aa82f310b0e5c2127b77f28c711c27 (diff) | |
| download | mariadb-git-7f6f31ae73674eb65f4881608b22c843efc23179.tar.gz | |
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
client/mysqltest.c:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/timezone_grant.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
Manual merge
mysql-test/r/olap.result:
Manual merge
mysql-test/t/olap.test:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/rpl_rotate_logs.result')
| -rw-r--r-- | mysql-test/r/rpl_rotate_logs.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result index a6d3697987a..f1618e246fa 100644 --- a/mysql-test/r/rpl_rotate_logs.result +++ b/mysql-test/r/rpl_rotate_logs.result @@ -27,8 +27,8 @@ insert into t2 values (34),(67),(123); flush logs; show binary logs; Log_name File_size -master-bin.000001 0 -master-bin.000002 0 +master-bin.000001 461 +master-bin.000002 213 master-bin.000003 98 create table t3 select * from temp_table; select * from t3; @@ -43,12 +43,12 @@ start slave; purge master logs to 'master-bin.000002'; show master logs; Log_name File_size -master-bin.000002 0 +master-bin.000002 213 master-bin.000003 407 purge binary logs to 'master-bin.000002'; show binary logs; Log_name File_size -master-bin.000002 0 +master-bin.000002 213 master-bin.000003 407 purge master logs before now(); show binary logs; @@ -74,7 +74,7 @@ count(*) create table t4 select * from temp_table; show binary logs; Log_name File_size -master-bin.000003 0 +master-bin.000003 4167 master-bin.000004 0 master-bin.000005 2032 show master status; |