Commit 0971b7ff authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents fdc831da 3fc3bb68

mysql-test/mysql-test-run.sh

+2 −2
Original line number Diff line number Diff line
@@ -1451,9 +1451,9 @@ then 
  then

    echo "Starting ndbcluster"

    ./ndb/ndbcluster --port-base=$NDBCLUSTER_PORT --small --diskless --initial --data-dir=$MYSQL_TEST_DIR/var || exit 1

    USE_NDBCLUSTER="--ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""

    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"host=localhost:$NDBCLUSTER_PORT\""

  else

    USE_NDBCLUSTER="--ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""

    USE_NDBCLUSTER="$USE_NDBCLUSTER --ndb-connectstring=\"$USE_RUNNING_NDBCLUSTER\""

    echo "Using ndbcluster at $USE_NDBCLUSTER"

  fi

  fi

mysql-test/r/binary.result

+18 −0
Original line number Diff line number Diff line
@@ -116,3 +116,21 @@ select collation(a), collation(b), collation(binary 'ccc') from t1 limit 1; 
collation(a)	collation(b)	collation(binary 'ccc')

latin1_bin	binary	latin1_bin

drop table t1;

create table t1( firstname char(20), lastname char(20));

insert into t1 values ("john","doe"),("John","Doe");

select * from t1 where firstname='john' and firstname like binary 'john';

firstname	lastname

john	doe

select * from t1 where firstname='john' and binary 'john' = firstname;

firstname	lastname

john	doe

select * from t1 where firstname='john' and firstname = binary 'john';

firstname	lastname

john	doe

select * from t1 where firstname='John' and firstname like binary 'john';

firstname	lastname

john	doe

select * from t1 where firstname='john' and firstname like binary 'John';

firstname	lastname

John	Doe

drop table t1;

mysql-test/r/ctype_utf8.result

+10 −0
Original line number Diff line number Diff line
@@ -560,3 +560,13 @@ select * from t1 where str='str'; 
str

str

drop table t1;

create table t1 (

str varchar(255) character set utf8 not null,

key str using hash (str(2))

) engine=heap;

INSERT INTO t1 VALUES ('str');

INSERT INTO t1 VALUES ('str2');

select * from t1 where str='str';

str

str

drop table t1;

mysql-test/r/ndb_blob.result

+50 −0
Original line number Diff line number Diff line 
drop table if exists t1;

drop database if exists test2;

set autocommit=0;

create table t1 (

a int not null primary key,
@@ -220,6 +221,55 @@ a b c d 
7	7xb7	777	7xdd7

8	8xb8	888	8xdd8

9	9xb9	999	9xdd9

select * from t1 order by a;

a	b	c	d

1	1xb1	111	1xdd1

2	2xb2	222	2xdd2

3	3xb3	333	3xdd3

4	4xb4	444	4xdd4

5	5xb5	555	5xdd5

6	6xb6	666	6xdd6

7	7xb7	777	7xdd7

8	8xb8	888	8xdd8

9	9xb9	999	9xdd9

alter table t1 add x int;

select * from t1 order by a;

a	b	c	d	x

1	1xb1	111	1xdd1	NULL

2	2xb2	222	2xdd2	NULL

3	3xb3	333	3xdd3	NULL

4	4xb4	444	4xdd4	NULL

5	5xb5	555	5xdd5	NULL

6	6xb6	666	6xdd6	NULL

7	7xb7	777	7xdd7	NULL

8	8xb8	888	8xdd8	NULL

9	9xb9	999	9xdd9	NULL

alter table t1 drop x;

select * from t1 order by a;

a	b	c	d

1	1xb1	111	1xdd1

2	2xb2	222	2xdd2

3	3xb3	333	3xdd3

4	4xb4	444	4xdd4

5	5xb5	555	5xdd5

6	6xb6	666	6xdd6

7	7xb7	777	7xdd7

8	8xb8	888	8xdd8

9	9xb9	999	9xdd9

create database test2;

use test2;

CREATE TABLE t2 (

a bigint unsigned NOT NULL PRIMARY KEY,

b int unsigned not null,

c int unsigned

) engine=ndbcluster;

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

select * from test.t1,t2 where test.t1.a = t2.a order by test.t1.a;

a	b	c	d	a	b	c

1	1xb1	111	1xdd1	1	1	1

2	2xb2	222	2xdd2	2	2	2

drop table t2;

use test;

delete from t1 where c >= 100;

commit;

select count(*) from t1;

mysql-test/r/show_check.result

+0 −7
Original line number Diff line number Diff line
@@ -401,10 +401,3 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3'; 
delete from mysql.db   

where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';

flush privileges;
 
set names latin1;

create database ``;

create table ``.`` (a int) engine=heap;

show table status from `` LIKE '';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

	HEAP	9	Fixed	0	5	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		

drop database ``;