Commit 039168c2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/my/mysql-5.1 

into  mysql.com:/home/my/mysql-5.1-TDC


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/field.cc:
  Merge with global tree
sql/sql_base.cc:
  Merge with global tree
sql/table.cc:
  Merge with global tree
parents fe245ed8 f631b361

mysql-test/mysql-test-run.sh

+10 −10
Original line number Diff line number Diff line
@@ -1320,16 +1320,16 @@ start_master() 


  if [ x$DO_DDD = x1 ]

  then

    $ECHO "set args $master_args" > $GDB_MASTER_INIT

    $ECHO "set args $master_args" > $GDB_MASTER_INIT$1

    manager_launch master ddd -display $DISPLAY --debugger \

    "gdb -x $GDB_MASTER_INIT" $MASTER_MYSQLD

    "gdb -x $GDB_MASTER_INIT$1" $MASTER_MYSQLD

  elif [ x$DO_GDB = x1 ]

  then

    if [ x$MANUAL_GDB = x1 ]

    then

      $ECHO "set args $master_args" > $GDB_MASTER_INIT

      $ECHO "set args $master_args" > $GDB_MASTER_INIT$1

      $ECHO "To start gdb for the master , type in another window:"

      $ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD"

      $ECHO "cd $CWD ; gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD"

      wait_for_master=1500

    else

      ( $ECHO set args $master_args;
@@ -1341,9 +1341,9 @@ disa 1 
end

r

EOF

      fi )  > $GDB_MASTER_INIT

      fi )  > $GDB_MASTER_INIT$1

      manager_launch master $XTERM -display $DISPLAY \

      -title "Master" -e gdb -x $GDB_MASTER_INIT $MASTER_MYSQLD

      -title "Master" -e gdb -x $GDB_MASTER_INIT$1 $MASTER_MYSQLD

    fi

  else

    manager_launch master $MASTER_MYSQLD $master_args
@@ -1965,10 +1965,10 @@ then 
    $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK1 -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $MASTER_MYPORT+1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --port=$MASTER_MYPORT --protocol=tcp -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --port=`expr $MASTER_MYPORT+1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --port=$SLAVE_MYPORT -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    $MYSQLADMIN --no-defaults --host=$hostname --protocol=tcp --port=`expr $SLAVE_MYPORT + 1` -u root -O connect_timeout=5 -O shutdown_timeout=20 shutdown > /dev/null 2>&1

    sleep_until_file_deleted 0 $MASTER_MYPID

    sleep_until_file_deleted 0 $MASTER_MYPID"1"

    sleep_until_file_deleted 0 $SLAVE_MYPID

mysql-test/r/flush_table.result

+31 −0
Original line number Diff line number Diff line
@@ -6,6 +6,37 @@ flush table t1; 
check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

unlock tables;

lock table t1 read;

lock table t1 read;

 flush table t1;

select * from t1;

a

1

unlock tables;

select * from t1;

a

1

unlock tables;

lock table t1 write;

 lock table t1 read;

flush table t1;

select * from t1;

a

1

unlock tables;

unlock tables;

lock table t1 read;

 lock table t1 write;

flush table t1;

select * from t1;

a

1

unlock tables;

unlock tables;

select * from t1;

a

1

drop table t1;

create table t1(table_id char(20) primary key);

create table t2(table_id char(20) primary key);

mysql-test/r/information_schema.result

+0 −1
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ select s1 from t1 where s1 in (select version from 
information_schema.tables) union select version from

information_schema.tables;

s1

0

10

drop table t1;

SHOW CREATE TABLE INFORMATION_SCHEMA.character_sets;

mysql-test/r/innodb.result

+7 −7
Original line number Diff line number Diff line
@@ -1615,7 +1615,7 @@ t2 CREATE TABLE `t2` ( 
) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t2;

create table t2 (id int(11) not null, id2 int(11) not null, constraint t1_id_fk foreign key (id2,id) references t1 (id)) engine = innodb;

ERROR HY000: Can't create table './test/t2' (errno: 150)

ERROR HY000: Can't create table 'test.t2' (errno: 150)

create table t2 (a int auto_increment primary key, b int, index(b), foreign key (b) references t1(id), unique(b)) engine=innodb;

show create table t2;

Table	Create Table
@@ -2437,7 +2437,7 @@ a b 
20	NULL

drop table t1;

create table t1 (v varchar(65530), key(v));

ERROR HY000: Can't create table './test/t1' (errno: 139)

ERROR HY000: Can't create table 'test.t1' (errno: 139)

create table t1 (v varchar(65536));

Warnings:

Note	1246	Converting column 'v' from VARCHAR to TEXT
@@ -2580,19 +2580,19 @@ character set = latin1 engine = innodb; 
drop table t1, t2, t3, t4, t5, t6, t7, t8, t9;

create table t1 (col1 varchar(768), index (col1))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table './test/t1.frm' (errno: 139)

ERROR HY000: Can't create table 'test.t1' (errno: 139)

create table t2 (col1 varchar(768) primary key)

character set = latin1 engine = innodb;

ERROR HY000: Can't create table './test/t2.frm' (errno: 139)

ERROR HY000: Can't create table 'test.t2' (errno: 139)

create table t3 (col1 varbinary(768) primary key)

character set = latin1 engine = innodb;

ERROR HY000: Can't create table './test/t3.frm' (errno: 139)

ERROR HY000: Can't create table 'test.t3' (errno: 139)

create table t4 (col1 text, index(col1(768)))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table './test/t4.frm' (errno: 139)

ERROR HY000: Can't create table 'test.t4' (errno: 139)

create table t5 (col1 blob, index(col1(768)))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table './test/t5.frm' (errno: 139)

ERROR HY000: Can't create table 'test.t5' (errno: 139)

CREATE TABLE t1

(

id INT PRIMARY KEY

mysql-test/r/merge.result

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ select * from t4; 
ERROR HY000: All tables in the MERGE table are not identically defined

alter table t4 add column c int;

ERROR HY000: All tables in the MERGE table are not identically defined

flush tables;

select * from t4;

ERROR HY000: All tables in the MERGE table are not identically defined

create database mysqltest;

create table mysqltest.t6 (a int not null primary key auto_increment, message char(20));

create table t5 (a int not null, b char(20), key(a)) engine=MERGE UNION=(test.t1,mysqltest.t6);