Commit 06ecd93c authored by unknown's avatar unknown
Browse files

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  manual merge
parents a2da9aed 453eea9b

mysql-test/t/rpl000005.test→mysql-test/extra/rpl_tests/rpl_sv_relay_space.test

+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,10 @@ 
# Change Date: 2006-01-17

# Change: Added order by in select

####################

# Change Date: 2006-02-02

# Change: renamed to make bettre sense,

# and wrapped per Engine test

############################

source include/master-slave.inc;



#
@@ -10,7 +14,7 @@ source include/master-slave.inc; 
#

SHOW VARIABLES LIKE 'relay_log_space_limit';



CREATE TABLE t1 (name varchar(64), age smallint(3));

eval CREATE TABLE t1 (name varchar(64), age smallint(3))ENGINE=$engine_type;

INSERT INTO  t1 SET name='Andy', age=31;

INSERT t1 SET name='Jacob', age=2;

INSERT into t1 SET name='Caleb', age=1;

mysql-test/r/rpl000004.a.result

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

mysql-test/r/rpl000004.b.result

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
count(*)

10

mysql-test/r/rpl000006.result

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

set SQL_LOG_BIN=0,timestamp=200006;

create table t1(t timestamp not null,a char(1));

insert into t1 ( a) values ('F');

select unix_timestamp(t) from t1;

unix_timestamp(t)

200006

load table t1 from master;

select unix_timestamp(t) from t1;

unix_timestamp(t)

200006

set SQL_LOG_BIN=1,timestamp=default;

drop table t1;

set SQL_LOG_BIN=0;

CREATE TABLE t1 (

a int not null

) ENGINE=MyISAM MAX_ROWS=4000 CHECKSUM=1;

INSERT INTO t1 VALUES (1);

load table t1 from master;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

drop table t1;

mysql-test/r/rpl_LD_INFILE.result

+100 −104
Original line number Diff line number Diff line
@@ -4,118 +4,114 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

DROP PROCEDURE IF EXISTS test.p1;

DROP TABLE IF EXISTS test.t1;

CREATE TABLE test.t1 (a VARCHAR(255), PRIMARY KEY(a));

LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;

DELETE FROM test.t1 WHERE a = 'abashed';

DELETE FROM test.t1;

LOAD DATA INFILE '../../std_data/words2.dat' INTO TABLE test.t1;

SELECT * FROM test.t1;

SELECT * FROM test.t1 ORDER BY a DESC;

a

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

aberration

SELECT * FROM test.t1;

a

abase

abased

abasement

abasements

abases

abash

abashed

abashes

abashing

abasing

abate

abated

abatement

abatements

abater

abates

abating

Abba

abbe

abbey

abbeys

abbot

abbots

Abbott

abbreviate

abbreviated

abbreviates

abbreviating

abbreviation

abbreviations

Abby

abdomen

abdomens

abdominal

abduct

abducted

abduction

abductions

abductor

abductors

abducts

Abe

abed

Abel

Abelian

Abelson

Aberdeen

Abernathy

aberrant

Abernathy

Aberdeen

Abelson

Abelian

Abel

abed

Abe

abducts

abductors

abductor

abductions

abduction

abducted

abduct

abdominal

abdomens

abdomen

Abby

abbreviations

abbreviation

abbreviating

abbreviates

abbreviated

abbreviate

Abbott

abbots

abbot

abbeys

abbey

abbe

Abba

abating

abates

abater

abatements

abatement

abated

abate

abasing

abashing

abashes

abashed

abash

abases

abasements

abasement

abased

abase

SELECT * FROM test.t1 ORDER BY a DESC;

a

aberration

DROP PROCEDURE IF EXISTS test.p1;

Warnings:

Note	1305	PROCEDURE p1 does not exist

aberrant

Abernathy

Aberdeen

Abelson

Abelian

Abel

abed

Abe

abducts

abductors

abductor

abductions

abduction

abducted

abduct

abdominal

abdomens

abdomen

Abby

abbreviations

abbreviation

abbreviating

abbreviates

abbreviated

abbreviate

Abbott

abbots

abbot

abbeys

abbey

abbe

Abba

abating

abates

abater

abatements

abatement

abated

abate

abasing

abashing

abashes

abashed

abash

abases

abasements

abasement

abased

abase

DROP TABLE test.t1;