Commit 16de51bc authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 

into  moonbone.local:/work/tmp_merge-5.1-mysql


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
parents 22d76f5a b128cfa8

BUILD/check-cpu

+5 −1
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ case "$cpu_family--$model_name" in 
  *Opteron*)

    cpu_arg="opteron";

    ;;

  # MacOSX / Intel  

  *i386*i486*)

    cpu_arg="pentium-m";

    ;;



  # Intel ia64

  *Itanium*)
@@ -131,7 +135,7 @@ else 
fi



cc_ver=`$cc --version | sed 1q`

cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`



case "$cc_ver--$cc_verno" in

  *GCC*)

client/mysqltest.c

+0 −3
Original line number Diff line number Diff line
@@ -5527,9 +5527,6 @@ int main(int argc, char **argv) 
  if ( opt_mark_progress )

    dump_progress(result_file);

  dynstr_free(&ds_progress);



  dynstr_free(&ds_res);



  if (!got_end_timer)

    timer_output();				/* No end_timer cmd, end it */

  free_used_memory();

include/config-netware.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ extern "C" { 
/* On NetWare, to fix the problem with the deletion of open files */

#define CANT_DELETE_OPEN_FILES 1



#define FN_LIBCHAR '\\'

#define FN_ROOTDIR "\\"

#define FN_DEVCHAR ':'



/* default directory information */

#define	DEFAULT_MYSQL_HOME    "sys:/mysql"

#define PACKAGE               "mysql"

mysql-test/r/compare.result

+7 −0
Original line number Diff line number Diff line
@@ -42,3 +42,10 @@ CHAR(31) = '' '' = CHAR(31) 
SELECT CHAR(30) = '', '' = CHAR(30);

CHAR(30) = ''	'' = CHAR(30)

0	0

create table t1 (a tinyint(1),b binary(1));

insert into t1 values (0x01,0x01);

select * from t1 where a=b;

a	b

select * from t1 where a=b and b=0x01;

a	b

drop table if exists t1;

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -821,3 +821,12 @@ a b real_b 
68	France	France

DROP VIEW v1;

DROP TABLE t1,t2;

CREATE TABLE t1 (a INT, b INT, KEY(a));

INSERT INTO t1 VALUES (1, 1), (2, 2), (3,3), (4,4);

EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	a	5	NULL	4	

EXPLAIN SELECT a, SUM(b) FROM t1 IGNORE INDEX (a) GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using temporary; Using filesort

DROP TABLE t1;