Commit 2f7fde48 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 1c2ea24e c7fefed4

Build-tools/Bootstrap

+1 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ if (defined $opt_changelog) 
unless ($opt_skip_manual)

{

	&logger("Updating manual files");

	foreach $file qw/internals manual reservedwords/

	foreach $file qw/internals manual reservedwords errmsg-table cl-errmsg-table/

	{

		system ("bk cat $opt_docdir/Docs/$file.texi > $target_dir/Docs/$file.texi") == 0

		or &abort("Could not update $file.texi in $target_dir/Docs/!");

VC++Files/libmysqld/libmysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ SOURCE=..\mysys\my_alloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_decimal.cpp

SOURCE=..\sql\my_decimal.cpp

# End Source File

# Begin Source File

mysql-test/r/ndb_condition_pushdown.result

+12 −4
Original line number Diff line number Diff line
@@ -235,13 +235,17 @@ auto 
4

select auto from t1 where 

string like "b%" and

vstring like "b%"

vstring like "b%" and

bin like concat(0xBB, '%') and

vbin like concat(0xBB, '%')

order by auto;

auto

2

select auto from t1 where 

string not like "b%" and

vstring not like "b%"

vstring not like "b%" and

bin not like concat(0xBB, '%') and

vbin not like concat(0xBB, '%')

order by auto;

auto

1
@@ -637,13 +641,17 @@ auto 
4

select auto from t1 where 

string like "b%" and

vstring like "b%"

vstring like "b%" and

bin like concat(0xBB, '%') and

vbin like concat(0xBB, '%')

order by auto;

auto

2

select auto from t1 where 

string not like "b%" and

vstring not like "b%"

vstring not like "b%" and

bin not like concat(0xBB, '%') and

vbin not like concat(0xBB, '%')

order by auto;

auto

1

mysql-test/r/sp.result

+4 −5
Original line number Diff line number Diff line
@@ -656,7 +656,6 @@ delete from t1| 
drop table if exists t3|

create table t3 ( s char(16), d int)|

call into_test4()|

Warnings:

select * from t3|

s	d

into4	NULL
@@ -1344,9 +1343,7 @@ end if; 
insert into t4 values (2, rc, t3);

end|

call bug1863(10)|

Warnings:

call bug1863(10)|

Warnings:

select * from t4|

f1	rc	t3

2	0	NULL
@@ -1643,9 +1640,7 @@ begin 
end|

call bug4579_1()|

call bug4579_1()|

Warnings:

call bug4579_1()|

Warnings:

drop procedure bug4579_1|

drop procedure bug4579_2|

drop table t3|
@@ -2118,12 +2113,16 @@ var 
call bug7743("OneWord")|

var

NULL

Warnings:

Warning	1329	No data to FETCH

call bug7743("anotherword")|

var

2

call bug7743("AnotherWord")|

var

NULL

Warnings:

Warning	1329	No data to FETCH

drop procedure bug7743|

drop table t4|

delete from t3|

mysql-test/t/ndb_condition_pushdown.test

+12 −4
Original line number Diff line number Diff line
@@ -236,12 +236,16 @@ order by auto; 
# Test LIKE/NOT LIKE

select auto from t1 where 

string like "b%" and

vstring like "b%"

vstring like "b%" and

bin like concat(0xBB, '%') and

vbin like concat(0xBB, '%')

order by auto;



select auto from t1 where 

string not like "b%" and

vstring not like "b%"

vstring not like "b%" and

bin not like concat(0xBB, '%') and

vbin not like concat(0xBB, '%')

order by auto;



# Various tests
@@ -586,12 +590,16 @@ order by auto; 
# Test LIKE/NOT LIKE

select auto from t1 where 

string like "b%" and

vstring like "b%"

vstring like "b%" and

bin like concat(0xBB, '%') and

vbin like concat(0xBB, '%')

order by auto;



select auto from t1 where 

string not like "b%" and

vstring not like "b%"

vstring not like "b%" and

bin not like concat(0xBB, '%') and

vbin not like concat(0xBB, '%')

order by auto;



# Various tests