Commit cdf03871 authored by unknown's avatar unknown
Browse files

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.
parent 7f6f31ae

configure.in

+3 −3
Original line number Diff line number Diff line
@@ -1965,7 +1965,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(
@@ -2000,7 +2000,7 @@ AC_LANG_SAVE 
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_SAVE 
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

mysql-test/r/olap.result

+1 −0
Original line number Diff line number Diff line
@@ -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);

mysql-test/r/rpl_log.result

+2 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/r/rpl_rotate_logs.result

+6 −6
Original line number Diff line number Diff line
@@ -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

mysql-test/t/olap.test

+1 −0
Original line number Diff line number Diff line
@@ -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 

#