Commit b96e4b68 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
parents 80b98425 3dd066e8

mysql-test/mysql-test-run.pl

+1 −7
Original line number Diff line number Diff line
@@ -659,11 +659,6 @@ sub command_line_setup () { 
    mtr_error("Coverage test needs the source - please use source dist");

  }



  if ( $glob_use_embedded_server and ! $opt_source_dist )

  {

    mtr_error("Embedded server needs source tree - please use source dist");

  }



  if ( $opt_gdb )

  {

    $opt_wait_timeout=  300;
@@ -853,7 +848,7 @@ sub executable_setup () { 
    if ( $glob_use_embedded_server )

    {

      my $path_examples= "$glob_basedir/libmysqld/examples";

      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest");

      $exe_mysqltest=    mtr_exe_exists("$path_examples/mysqltest_embedded");

      $exe_mysql_client_test=

        mtr_exe_exists("$path_examples/mysql_client_test_embedded",

		       "/usr/bin/false");
@@ -878,7 +873,6 @@ sub executable_setup () { 
  else

  {

    $path_client_bindir= mtr_path_exists("$glob_basedir/bin");

    $exe_mysqltest=      mtr_exe_exists("$path_client_bindir/mysqltest");

    $exe_mysqldump=      mtr_exe_exists("$path_client_bindir/mysqldump");

    $exe_mysqlshow=      mtr_exe_exists("$path_client_bindir/mysqlshow");

    $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");

mysql-test/r/merge.result

+6 −6
Original line number Diff line number Diff line
@@ -652,30 +652,30 @@ create table t3 engine=merge union=(t1, t2) select * from t2; 
ERROR HY000: You can't specify target table 't2' for update in FROM clause

drop table t1, t2;

create table t1 (

a double(16,6),

a double(14,4),

b varchar(10),

index (a,b)

) engine=merge union=(t2,t3);

create table t2 (

a double(16,6),

a double(14,4),

b varchar(10),

index (a,b)

) engine=myisam;

create table t3 (

a double(16,6),

a double(14,4),

b varchar(10),

index (a,b)

) engine=myisam;

insert into t2 values ( null, '');

insert into t2 values ( 9999999999.999999, '');

insert into t2 values ( 9999999999.999, '');

insert into t3 select * from t2;

select min(a), max(a) from t1;

min(a)	max(a)

9999999999.999998	9999999999.999998

9999999999.9990	9999999999.9990

flush tables;

select min(a), max(a) from t1;

min(a)	max(a)

9999999999.999998	9999999999.999998

9999999999.9990	9999999999.9990

drop table t1, t2, t3;

create table t1 (a int,b int,c int, index (a,b,c));

create table t2 (a int,b int,c int, index (a,b,c));

mysql-test/r/sql_mode.result

+23 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ sql_mode NO_FIELD_OPTIONS,MYSQL323,MYSQL40 
show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL auto_increment,

  `a` int(11) NOT NULL,

  `pseudo` varchar(35) NOT NULL default '',

  `email` varchar(60) NOT NULL default '',

  PRIMARY KEY  (`a`),
@@ -79,8 +79,8 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE "t1" (

  "a" int(11) NOT NULL,

  "pseudo" varchar(35) NOT NULL default '',

  "email" varchar(60) NOT NULL default '',

  "pseudo" varchar(35) character set latin2 NOT NULL default '',

  "email" varchar(60) character set latin2 NOT NULL default '',

  PRIMARY KEY  ("a"),

  UNIQUE KEY "email" ("email")

)
@@ -140,3 +140,23 @@ t1 CREATE TABLE `t1` ( 
drop table t1 ;

set @@SQL_MODE=NULL;

ERROR 42000: Variable 'sql_mode' can't be set to the value of 'NULL'

set session sql_mode=ansi;

create table t1

(f1 integer auto_increment primary key,

f2 timestamp default current_timestamp on update current_timestamp);

show create table t1;

Table	Create Table

t1	CREATE TABLE "t1" (

  "f1" int(11) NOT NULL auto_increment,

  "f2" timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,

  PRIMARY KEY  ("f1")

)

set session sql_mode=no_field_options;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `f1` int(11) NOT NULL,

  `f2` timestamp NOT NULL default CURRENT_TIMESTAMP,

  PRIMARY KEY  (`f1`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/t/merge.test

+4 −8
Original line number Diff line number Diff line
@@ -294,29 +294,25 @@ drop table t1, t2; 
# non-debug build. But there is no guarantee that this will be always so.

#

create table t1 (

 a double(16,6),

 a double(14,4),

 b varchar(10),

 index (a,b)

) engine=merge union=(t2,t3);



create table t2 (

 a double(16,6),

 a double(14,4),

 b varchar(10),

 index (a,b)

) engine=myisam;



create table t3 (

 a double(16,6),

 a double(14,4),

 b varchar(10),

 index (a,b)

) engine=myisam;



insert into t2 values ( null, '');

# We may have insufficient accuracy for 16 digits of '9'.

# Suppress a "truncate" warning due to accuracy problems.

--disable_warnings

insert into t2 values ( 9999999999.999999, '');

--enable_warnings

insert into t2 values ( 9999999999.999, '');

insert into t3 select * from t2;

select min(a), max(a) from t1;

flush tables;

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ drop table t1; 
--exec $MYSQL_DUMP --skip-comments --databases test



create database mysqldump_test_db character set latin2 collate latin2_bin;

--exec $MYSQL_DUMP --skip-comments --databases mysqldump_test_db;

--exec $MYSQL_DUMP --skip-comments --databases mysqldump_test_db

drop database mysqldump_test_db;



#