Commit ed439bc6 authored by unknown's avatar unknown
Browse files

Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0 

into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1


sql/ha_federated.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents 81a7a93f 9dfb7aab

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ magnus@msdesk.mysql.com 
magnus@neptunus.(none)

magnus@shellback.(none)

marko@hundin.mysql.fi

marty@flipper.bredbandsbolaget.se

marty@linux.site

marty@shark.

mats@mysql.com

mysql-test/README

+11 −2
Original line number Diff line number Diff line
@@ -2,8 +2,17 @@ This directory contains a test suite for mysql daemon. To run 
the currently existing test cases, simply execute ./mysql-test-run in

this directory. It will fire up the newly built mysqld and test it.



If you want to run the test with a running MySQL server use the --external

option to mysql-test-run.

If you want to run a test with a running MySQL server use the --extern

option to mysql-test-run. Please note that in this mode the test suite

expects user to specify test names to run. Otherwise it falls back to the

normal "non-extern" behaviour. The reason is that some tests

could not run with external server. Here is the sample command

to test "alias" and "analyze" tests on external server:



mysql-test-run --extern alias analyze



To match your setup you might also need to provide --socket, --user and

other relevant options.



Note that you do not have to have to do make install, and you could

actually have a co-existing MySQL installation - the tests will not

mysql-test/lib/mtr_cases.pl

+8 −0
Original line number Diff line number Diff line
@@ -154,6 +154,14 @@ sub collect_one_test_case($$$$$) { 
    }

  }



  if ( defined mtr_match_prefix($tname,"federated") )

  {

    $tinfo->{'slave_num'}= 1;           # Default, use one slave



    # FIXME currently we always restart slaves

    $tinfo->{'slave_restart'}= 1;

  }



  # FIXME what about embedded_server + ndbcluster, skip ?!



  my $master_opt_file= "$testdir/$tname-master.opt";

mysql-test/r/insert_select.result

+15 −0
Original line number Diff line number Diff line
@@ -634,3 +634,18 @@ ff1 ff2 
1	2

2	1

drop table t1, t2;

create table t1 (a int unique);

create table t2 (a int, b int);

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

insert into t2 values (1,2);

select * from t1;

a

1

2

insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b;

select * from t1;

a

2

3

drop table t1;

drop table t2;

mysql-test/r/insert_update.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2;

CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B));

INSERT t1 VALUES (1,2,10), (3,4,20);

INSERT t1 VALUES (5,6,30) ON DUPLICATE KEY UPDATE c=c+100;