Commit e17a1e0a authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0


sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 68b8daf2 aec0408b

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -206,11 +206,13 @@ void __CDECL hfree(void *ptr); 
#endif

#endif /* MSDOS */



#ifndef errno				/* did we already get it? */

#ifdef HAVE_ERRNO_AS_DEFINE

#include <errno.h>			/* errno is a define */

#else

extern int errno;			/* declare errno */

#endif

#endif					/* #ifndef errno */

extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];

extern char *home_dir;			/* Home directory for user */

extern char *my_progname;		/* program-name (printed in errors) */

innobase/srv/srv0start.c

+16 −2
Original line number Diff line number Diff line
@@ -568,7 +568,14 @@ open_or_create_log_file( 
	files[i] = os_file_create(name, OS_FILE_CREATE, OS_FILE_NORMAL,

						OS_LOG_FILE, &ret);

	if (ret == FALSE) {

		if (os_file_get_last_error(FALSE) != OS_FILE_ALREADY_EXISTS) {

		if (os_file_get_last_error(FALSE) != OS_FILE_ALREADY_EXISTS

#ifdef UNIV_AIX

		   	/* AIX 5.1 after security patch ML7 may have errno set

			to 0 here, which causes our function to return 100;

			work around that AIX problem */

		   && os_file_get_last_error(FALSE) != 100

#endif

		) {

			fprintf(stderr,

			"InnoDB: Error in creating or opening %s\n", name);
@@ -728,7 +735,14 @@ open_or_create_data_files( 
					OS_FILE_NORMAL, OS_DATA_FILE, &ret);



			if (ret == FALSE && os_file_get_last_error(FALSE) !=

						OS_FILE_ALREADY_EXISTS) {

						OS_FILE_ALREADY_EXISTS

#ifdef UNIV_AIX

		   		/* AIX 5.1 after security patch ML7 may have

				errno set to 0 here, which causes our function

				to return 100; work around that AIX problem */

		   	    && os_file_get_last_error(FALSE) != 100

#endif

			) {

				fprintf(stderr,

				"InnoDB: Error in creating or opening %s\n",

				name);

mysql-test/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c 
dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.disabled $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(distdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.result.es $(srcdir)/r/*.require $(distdir)/r
@@ -63,7 +64,7 @@ install-data-local: 
		$(DESTDIR)$(testdir)/std_data

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t

	-$(INSTALL_DATA) $(srcdir)/t/*.disabled $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.slave-mi $(DESTDIR)$(testdir)/t

mysql-test/include/have_cp1250_ch.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
-- require r/have_cp1250_ch.require

disable_query_log;

show collation like "cp1250_czech_cs";

enable_query_log;

mysql-test/r/bigint.result

+39 −0
Original line number Diff line number Diff line
@@ -87,3 +87,42 @@ drop table t1; 
SELECT '0x8000000000000001'+0;

'0x8000000000000001'+0

0

create table t1 (

value64  bigint unsigned  not null,

value32  integer          not null,

primary key(value64, value32)

);

create table t2 (

value64  bigint unsigned  not null,

value32  integer          not null,

primary key(value64, value32)

);

insert into t1 values(17156792991891826145, 1);

insert into t1 values( 9223372036854775807, 2);

insert into t2 values(17156792991891826145, 3);

insert into t2 values( 9223372036854775807, 4);

select * from t1;

value64	value32

9223372036854775807	2

17156792991891826145	1

select * from t2;

value64	value32

9223372036854775807	4

17156792991891826145	3

select * from t1, t2 where t1.value64=17156792991891826145 and

t2.value64=17156792991891826145;

value64	value32	value64	value32

17156792991891826145	1	17156792991891826145	3

select * from t1, t2 where t1.value64=17156792991891826145 and

t2.value64=t1.value64;

value64	value32	value64	value32

17156792991891826145	1	17156792991891826145	3

select * from t1, t2 where t1.value64= 9223372036854775807 and

t2.value64=9223372036854775807;

value64	value32	value64	value32

9223372036854775807	2	9223372036854775807	4

select * from t1, t2 where t1.value64= 9223372036854775807 and

t2.value64=t1.value64;

value64	value32	value64	value32

9223372036854775807	2	9223372036854775807	4

drop table t1, t2;