Commit 7f6f31ae authored by unknown's avatar unknown
Browse files

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
parents 21332fe0 ddc35864

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -3393,10 +3393,10 @@ static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields, 
    int10_to_str((int) field->type, buff, 10);

    dynstr_append(ds, buff);

    dynstr_append_mem(ds, "\t", 1);

    int10_to_str((int) field->length, buff, 10);

    longlong10_to_str((unsigned int) field->length, buff, 10);

    dynstr_append(ds, buff);

    dynstr_append_mem(ds, "\t", 1);

    int10_to_str((int) field->max_length, buff, 10);

    longlong10_to_str((unsigned int) field->max_length, buff, 10);

    dynstr_append(ds, buff);

    dynstr_append_mem(ds, "\t", 1);

    dynstr_append_mem(ds, (char*) (IS_NOT_NULL(field->flags) ?

cmd-line-utils/libedit/read.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ el_gets(EditLine *el, int *nread) 
#endif /* DEBUG_READ */

			break;

		}

		if ((uint)cmdnum >= el->el_map.nfunc) {	/* BUG CHECK command */

		if ((unsigned int)cmdnum >= el->el_map.nfunc) {	/* BUG CHECK command */

#ifdef DEBUG_EDIT

			(void) fprintf(el->el_errfile,

			    "ERROR: illegal command from key 0%o\r\n", ch);

configure.in

+1 −1
Original line number Diff line number Diff line 
dnl -*- ksh -*-

dnl Process this file with autoconf to produce a configure script.



AC_PREREQ(2.58)dnl		Minimum Autoconf version required.

AC_PREREQ(2.57)dnl		Minimum Autoconf version required.



AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

mysql-test/r/olap.result

+11 −0
Original line number Diff line number Diff line
@@ -576,4 +576,15 @@ 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;

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);

SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP;

a	b	c	count

1	1	1	1

1	1	NULL	1

1	2	1	1

1	2	NULL	1

1	NULL	NULL	2

NULL	NULL	NULL	2

DROP TABLE t1;

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	0

master-bin.000001	1171

master-bin.000002	510

start slave;

show binary logs;

Log_name	File_size

slave-bin.000001	0

slave-bin.000001	1285

slave-bin.000002	348

show binlog events in 'slave-bin.000001' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info