Commit 8b1a32ae authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mysql_src/mysql-4.1 

into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset


BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
  Delete: BUILD/compile-pentium64-valgrind-max
BitKeeper/etc/config:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.h:
  Auto merged
client/mysqltest.c:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/log_event.cc:
  manual merge
sql/log_event.h:
  manual merge
sql/slave.cc:
  manual merge
sql/sql_yacc.yy:
  manual merge
parents 3f11381b 61dfc334

BUILD/compile-pentium64-valgrind-max

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -73,5 +73,6 @@ hours: 
[nick:]checkout:get

[jonas:]checkout:get

[tomas:]checkout:get

[guilhem:]checkout:get

checkout:edit

eoln:unix

mysql-test/r/rpl_dual_pos_advance.result

0 → 100644
+22 −0
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;

reset master;

change master to master_host="127.0.0.1",master_port=SLAVE_PORT,master_user="root";

start slave;

create table t1 (n int);

create table t4 (n int);

create table t5 (n int);

create table t6 (n int);

show tables;

Tables_in_test

t1

t4

t5

t6

stop slave;

reset slave;

drop table t1,t4,t5,t6;

mysql-test/r/subselect.result

+3 −2
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ Code2 char(2) NOT NULL default '', 
PRIMARY KEY  (Code)

) ENGINE=MyISAM;

INSERT INTO t2 VALUES ('AUS','Australia','Oceania','Australia and New Zealand',7741220.00,1901,18886000,79.8,351182.00,392911.00,'Australia','Constitutional Monarchy, Federation','Elisabeth II',135,'AU');

INSERT INTO t2 VALUES ('AZE','Azerbaijan','Asia','Middle East',86600.00,1991,7734000,62.9,4127.00,4100.00,'Azrbaycan','Federal Republic','Heydr liyev',144,'AZ');

INSERT INTO t2 VALUES ('AZE','Azerbaijan','Asia','Middle East',86600.00,1991,7734000,62.9,4127.00,4100.00,'Azärbaycan','Federal Republic','Heydär Äliyev',144,'AZ');

select t2.Continent, t1.Name, t1.Population from t2 LEFT JOIN t1 ON t2.Code = t1.t2  where t1.Population IN (select max(t1.Population) AS Population from t1, t2 where t1.t2 = t2.Code group by Continent);

Continent	Name	Population

Oceania	Sydney	3276207
@@ -2512,7 +2512,7 @@ Code2 char(2) NOT NULL default '' 
) ENGINE=MyISAM;

INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');

INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');

INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes franaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');

INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes françaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');

INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');

/*!40000 ALTER TABLE t1 ENABLE KEYS */;

SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);
@@ -2987,3 +2987,4 @@ select * from (select max(fld) from t1) as foo; 
max(fld)

1

drop table t1;

purge master logs before (select adddate(current_timestamp(), interval -4 day));

mysql-test/t/rpl_dual_pos_advance-master.opt

0 → 100644
+0 −0

Empty file added.