Commit 95754006 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


BitKeeper/deleted/.del-disabled.def:
  Delete: mysql-test/t/disabled.def
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
mysql-test/r/innodb.result:
  Manual merge from 4.1 to 5.0
mysql-test/r/select.result:
  Manual merge from 4.1 to 5.0
mysql-test/t/select.test:
  Manual merge from 4.1 to 5.0
sql/item.cc:
  Manual merge from 4.1 to 5.0
parents ada963e0 68045dfd

libmysqld/lib_sql.cc

+2 −2
Original line number Diff line number Diff line
@@ -423,9 +423,9 @@ int init_embedded_server(int argc, char **argv, char **groups) 


  acl_error= 0;

#ifndef NO_EMBEDDED_ACCESS_CHECKS

  if (!(acl_error= acl_init((THD *)0, opt_noacl)) &&

  if (!(acl_error= acl_init(opt_noacl)) &&

      !opt_noacl)

    (void) grant_init((THD *)0);

    (void) grant_init();

#endif

  if (acl_error || my_tz_init((THD *)0, default_tz_name, opt_bootstrap))

  {

mysql-test/r/innodb.result

+28 −0
Original line number Diff line number Diff line
@@ -1739,6 +1739,34 @@ select min(b) from t1 where a='8'; 
min(b)

6

drop table t1;

create table test_checksum(a int not null) engine=innodb DEFAULT CHARSET=latin1;

insert into test_checksum values (1),(2);

set autocommit=0;

checksum table test_checksum;

Table	Checksum

test.test_checksum	1531596814

insert into test_checksum values(3);

checksum table test_checksum;

Table	Checksum

test.test_checksum	1531596814

commit;

checksum table test_checksum;

Table	Checksum

test.test_checksum	2050879373

commit;

drop table test_checksum;

create table test_checksum(a int not null) engine=innodb DEFAULT CHARSET=latin1;

insert into test_checksum values (1),(2);

set autocommit=1;

checksum table test_checksum;

Table	Checksum

test.test_checksum	1531596814

set autocommit=1;

insert into test_checksum values(3);

checksum table test_checksum;

Table	Checksum

test.test_checksum	2050879373

drop table test_checksum;

create table t1 (x bigint unsigned not null primary key) engine=innodb;

insert into t1(x) values (0xfffffffffffffff0),(0xfffffffffffffff1);

select * from t1;

mysql-test/r/select.result

+9 −0
Original line number Diff line number Diff line
@@ -3029,3 +3029,12 @@ id 
102

drop table t1, t2;

drop view v1, v2, v3;

create table t1(f1 int, f2 int);

create table t2(f3 int);

select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));

f1

select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));

f1

select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));

f1

drop table t1,t2;

mysql-test/t/innodb.test

+41 −0
Original line number Diff line number Diff line
@@ -1268,6 +1268,47 @@ insert into t1 values ('8', '6'), ('4', '7'); 
select min(a) from t1;

select min(b) from t1 where a='8';

drop table t1;



#

# Test that checksum table uses a consistent read Bug #12669

#

connect (a,localhost,root,,);

connect (b,localhost,root,,);

connection a;

create table test_checksum(a int not null) engine=innodb DEFAULT CHARSET=latin1;

insert into test_checksum values (1),(2);

set autocommit=0;

checksum table test_checksum;

connection b;

insert into test_checksum values(3);

connection a;

#

# Here checksum should not see insert

#

checksum table test_checksum;

connection a;

commit;

checksum table test_checksum;

commit;

drop table test_checksum;

#

# autocommit = 1

#

connection a;

create table test_checksum(a int not null) engine=innodb DEFAULT CHARSET=latin1;

insert into test_checksum values (1),(2);

set autocommit=1;

checksum table test_checksum;

connection b;

set autocommit=1;

insert into test_checksum values(3);

connection a;

#

# Here checksum sees insert

#

checksum table test_checksum;

drop table test_checksum;



# End of 4.1 tests



#

mysql-test/t/select.test

+10 −0
Original line number Diff line number Diff line
@@ -2181,6 +2181,16 @@ select found_rows(); 


DROP TABLE t1;



#

# Bug #13356 assertion failed in resolve_const_item()

#

create table t1(f1 int, f2 int);

create table t2(f3 int);

select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,1));

select f1 from t1,t2 where f1=f2 and (f1,NULL) = ((1,1));

select f1 from t1,t2 where f1=f2 and (f1,f2) = ((1,NULL));

drop table t1,t2; 



# End of 4.1 tests



#