Commit c2575322 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 

into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1


mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/valgrind.supp:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
include/Makefile.am:
  manual merge
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/select.result:
  manual merge
parents d98a7999 41b9884d

include/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ noinst_HEADERS = config-win.h config-netware.h \ 
			thr_lock.h t_ctype.h violite.h md5.h base64.h \

			mysql_version.h.in my_handler.h my_time.h decimal.h \

			my_vle.h my_user.h my_atomic.h atomic/nolock.h \

			atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h

			atomic/rwlock.h atomic/x86-gcc.h atomic/x86-msvc.h \

			my_libwrap.h



# mysql_version.h are generated

CLEANFILES =            mysql_version.h my_config.h readline openssl

include/my_libwrap.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program; if not, write to the Free Software

   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#ifdef HAVE_LIBWRAP

#include <tcpd.h>

#include <syslog.h>

#ifdef NEED_SYS_SYSLOG_H

#include <sys/syslog.h>

#endif /* NEED_SYS_SYSLOG_H */



extern void my_fromhost(struct request_info *req);

extern int my_hosts_access(struct request_info *req);

extern char *my_eval_client(struct request_info *req);



#endif /* HAVE_LIBWRAP */

mysql-test/r/insert_select.result

+4 −0
Original line number Diff line number Diff line
@@ -686,3 +686,7 @@ ERROR 42S22: Unknown column 'z' in 'field list' 
insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x);

ERROR 42S22: Unknown column 't2.x' in 'field list'

drop table t1,t2;

CREATE TABLE t1 (a int PRIMARY KEY);

INSERT INTO t1 values (1), (2);

INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1;

DROP TABLE t1;

mysql-test/r/myisam.result

+13 −0
Original line number Diff line number Diff line
@@ -747,6 +747,19 @@ select count(id1) from t1 where id2 = 10; 
count(id1)

5

drop table t1;

CREATE TABLE t1(a TINYINT, KEY(a)) ENGINE=MyISAM;

INSERT INTO t1 VALUES(1);

SELECT MAX(a) FROM t1 IGNORE INDEX(a);

MAX(a)

1

ALTER TABLE t1 DISABLE KEYS;

SELECT MAX(a) FROM t1;

MAX(a)

1

SELECT MAX(a) FROM t1 IGNORE INDEX(a);

MAX(a)

1

DROP TABLE t1;

CREATE TABLE t1(a CHAR(9), b VARCHAR(7)) ENGINE=MyISAM;

INSERT INTO t1(a) VALUES('xxxxxxxxx'),('xxxxxxxxx');

UPDATE t1 AS ta1,t1 AS ta2 SET ta1.b='aaaaaa',ta2.b='bbbbbb';

mysql-test/t/func_time.test

+4 −2
Original line number Diff line number Diff line
@@ -392,8 +392,10 @@ drop table t1; 
# Bug #16546

# 



select now() - now() + 0, curtime() - curtime() + 0, 

create table t1 select now() - now(), curtime() - curtime(), 

                       sec_to_time(1) + 0, from_unixtime(1) + 0;

show create table t1;

drop table t1;



--echo End of 4.1 tests