bk commit into 5.0 tree (konstantin:1.1948)

[Konstantin Osipov]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1948 05/07/19 03:01:25 konstantin@stripped +5 -0
  After-merge fixes.

  mysql-test/t/olap.test
    1.20 05/07/19 03:01:20 konstantin@stripped +1 -0
    A post-merge fix.

  mysql-test/r/rpl_rotate_logs.result
    1.72 05/07/19 03:01:20 konstantin@stripped +6 -6
    Post-merge fixes. Guilhem: please investigate.

  mysql-test/r/rpl_log.result
    1.62 05/07/19 03:01:20 konstantin@stripped +2 -2
    Post-merge fixes. Guilhem: please investigate.

  mysql-test/r/olap.result
    1.27 05/07/19 03:01:20 konstantin@stripped +1 -0
    More post-merge fixes.

  configure.in
    1.324 05/07/19 03:01:20 konstantin@stripped +3 -3
    A hack to ensure that the tree compiles on SuSE 9.0 with -ansi -pedantic

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	oak.local
# Root:	/home/kostja/mysql/mysql-5.0-merge

--- 1.323/configure.in	2005-07-19 00:55:32 +04:00
+++ 1.324/configure.in	2005-07-19 03:01:20 +04:00
@@ -1965,7 +1965,7 @@
 
 if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 then
-  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
 fi
 
 AC_TRY_COMPILE(
@@ -2000,7 +2000,7 @@
 AC_LANG_CPLUSPLUS
 if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 then
-  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
 fi
 AC_TRY_COMPILE(
 [#undef inline
@@ -2033,7 +2033,7 @@
 AC_LANG_CPLUSPLUS
 if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
 then
-  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
 fi
 AC_TRY_COMPILE(
 [#undef inline

--- 1.26/mysql-test/r/olap.result	2005-07-19 00:55:32 +04:00
+++ 1.27/mysql-test/r/olap.result	2005-07-19 03:01:20 +04:00
@@ -576,6 +576,7 @@
 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);

--- 1.19/mysql-test/t/olap.test	2005-07-19 00:55:32 +04:00
+++ 1.20/mysql-test/t/olap.test	2005-07-19 03:01:20 +04:00
@@ -265,6 +265,7 @@
 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 
 #
 

--- 1.71/mysql-test/r/rpl_rotate_logs.result	2005-07-19 00:49:14 +04:00
+++ 1.72/mysql-test/r/rpl_rotate_logs.result	2005-07-19 03:01:20 +04:00
@@ -27,8 +27,8 @@
 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 @@
 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 @@
 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

--- 1.61/mysql-test/r/rpl_log.result	2005-07-19 00:49:14 +04:00
+++ 1.62/mysql-test/r/rpl_log.result	2005-07-19 03:01:20 +04:00
@@ -69,12 +69,12 @@
 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