diff options
| author | unknown <konstantin@mysql.com> | 2005-07-19 03:01:25 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-19 03:01:25 +0400 |
| commit | cdf03871061e2131153f4cf6ddcbc25db4108781 (patch) | |
| tree | 7b00904d1d20266472e7192c60af71fe6d2137d6 /mysql-test | |
| parent | 7f6f31ae73674eb65f4881608b22c843efc23179 (diff) | |
| download | mariadb-git-cdf03871061e2131153f4cf6ddcbc25db4108781.tar.gz | |
After-merge fixes.
configure.in:
A hack to ensure that the tree compiles on SuSE 9.0 with -ansi -pedantic
mysql-test/r/olap.result:
More post-merge fixes.
mysql-test/r/rpl_log.result:
Post-merge fixes. Guilhem: please investigate.
mysql-test/r/rpl_rotate_logs.result:
Post-merge fixes. Guilhem: please investigate.
mysql-test/t/olap.test:
A post-merge fix.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/olap.result | 1 | ||||
| -rw-r--r-- | mysql-test/r/rpl_log.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl_rotate_logs.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/olap.test | 1 |
4 files changed, 10 insertions, 8 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 0b422047a49..69871b2110b 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -576,6 +576,7 @@ EXPLAIN SELECT type FROM v1 GROUP BY type WITH ROLLUP; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 10 Using filesort DROP VIEW v1; +DROP TABLE t1; CREATE TABLE t1 (a INT(10) NOT NULL, b INT(10) NOT NULL); INSERT INTO t1 VALUES (1, 1); INSERT INTO t1 VALUES (1, 2); diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index bc2e3370019..be8d5291ad9 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -69,12 +69,12 @@ master-bin.000002 346 Query 1 434 use `test`; insert into t1 values (1) master-bin.000002 434 Query 1 510 use `test`; drop table t1 show binary logs; Log_name File_size -master-bin.000001 1171 +master-bin.000001 1389 master-bin.000002 510 start slave; show binary logs; Log_name File_size -slave-bin.000001 1285 +slave-bin.000001 1559 slave-bin.000002 348 show binlog events in 'slave-bin.000001' from 4; Log_name Pos Event_type Server_id End_log_pos Info diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result index f1618e246fa..bf2ef98c87f 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 461 -master-bin.000002 213 +master-bin.000001 592 +master-bin.000002 363 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 213 +master-bin.000002 363 master-bin.000003 407 purge binary logs to 'master-bin.000002'; show binary logs; Log_name File_size -master-bin.000002 213 +master-bin.000002 363 master-bin.000003 407 purge master logs before now(); show binary logs; @@ -74,8 +74,8 @@ count(*) create table t4 select * from temp_table; show binary logs; Log_name File_size -master-bin.000003 4167 -master-bin.000004 0 +master-bin.000003 4185 +master-bin.000004 4190 master-bin.000005 2032 show master status; File Position Binlog_Do_DB Binlog_Ignore_DB diff --git a/mysql-test/t/olap.test b/mysql-test/t/olap.test index 78ea56c8090..f3017978588 100644 --- a/mysql-test/t/olap.test +++ b/mysql-test/t/olap.test @@ -265,6 +265,7 @@ SELECT type FROM v1 GROUP BY type WITH ROLLUP; EXPLAIN SELECT type FROM v1 GROUP BY type WITH ROLLUP; DROP VIEW v1; +DROP TABLE t1; # Test for bug #11543: ROLLUP query with a repeated column in GROUP BY # |