Commit daaeeedb authored by unknown's avatar unknown
Browse files

Merged from 4.1 


innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.h:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
mysql-test/r/grant2.result:
  Hand-merged new test
mysql-test/t/grant2.test:
  Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
  Used 5.0 version per tomas
sql/sql_acl.cc:
  Merge fix for Bug #3309.
parents 80b474bf 92895d00

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

mysql-test/r/ctype_cp1250_ch.result

0 → 100644
+9 −0
Original line number Diff line number Diff line 
SHOW COLLATION LIKE 'cp1250_czech_cs';

Collation	Charset	Id	Default	Compiled	Sortlen

cp1250_czech_cs	cp1250	34		Yes	2

CREATE TABLE t1 (a char(16)) character set cp1250 collate cp1250_czech_cs;

INSERT INTO t1 VALUES ('');

SELECT a, length(a), a='', a=' ', a='  ' FROM t1;

a	length(a)	a=''	a=' '	a='  '

	0	1	1	1

DROP TABLE t1;

mysql-test/r/grant2.result

+16 −0
Original line number Diff line number Diff line
@@ -233,3 +233,19 @@ drop user mysqltest_B@'%'; 
ERROR 42000: Access denied for user 'mysqltest_3'@'localhost' to database 'mysql'

drop user mysqltest_B@'%';

drop user mysqltest_3@localhost;

create database mysqltest_1;

create table mysqltest_1.t1 (i int);

insert into mysqltest_1.t1 values (1),(2),(3);

GRANT ALL ON mysqltest_1.t1 TO mysqltest_1@'127.0.0.0/255.0.0.0';

show grants for current_user();

Grants for mysqltest_1@127.0.0.0/255.0.0.0

GRANT USAGE ON *.* TO 'mysqltest_1'@'127.0.0.0/255.0.0.0'

GRANT ALL PRIVILEGES ON `mysqltest_1`.`t1` TO 'mysqltest_1'@'127.0.0.0/255.0.0.0'

select * from t1;

i

1

2

3

REVOKE ALL ON mysqltest_1.t1 FROM mysqltest_1@'127.0.0.0/255.0.0.0';

drop table mysqltest_1.t1;

drop database mysqltest_1;