Commit 6337cd1c authored by unknown's avatar unknown
Browse files

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

into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
parents 52808a58 e9a3612a

libmysql/Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ mystringsobjects = strmov.lo strxmov.lo strxnmov.lo strnmov.lo \ 
			ctype-win1250ch.lo ctype-utf8.lo ctype-extra.lo \

			ctype-ucs2.lo ctype-gb2312.lo ctype-gbk.lo \

			ctype-sjis.lo ctype-tis620.lo ctype-ujis.lo \

			ctype-uca.lo xml.lo

			ctype-uca.lo xml.lo my_strtoll10.lo



mystringsextra= 	strto.c

dbugobjects =		dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo

libmysqld/libmysqld.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, 


  if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION ||

      (mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION &&

       host && strcmp(host,LOCAL_HOST)))

       host && *host && strcmp(host,LOCAL_HOST)))

    DBUG_RETURN(cli_mysql_real_connect(mysql, host, user, 

				       passwd, db, port, 

				       unix_socket, client_flag));

mysql-test/include/ps_conv.inc

0 → 100644
+1202 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/include/ps_create.inc

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#---- Please do not alter the following table definitions -------#



--disable_warnings

drop table if exists t1, t_many_col_types ;

drop table if exists t1, t9 ;

--enable_warnings



eval create table t1
@@ -28,7 +28,7 @@ eval create table t1 
  primary key(a)

) engine = $type ;



eval create table t_many_col_types 

eval create table t9 

(

  c1  tinyint, c2  smallint, c3  mediumint, c4  int,

  c5  integer, c6  bigint, c7  float, c8  double,

mysql-test/include/ps_modify.inc

+123 −5
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
# several test cases.

#

# Please do not modify the structure (DROP/ALTER..) of the tables

#     't1' and 't_many_col_types'. 

#     't1' and 't9'. 

#

# But you are encouraged to use these two tables within your statements

# whenever possible. 

# (DELETE/UPDATE/...) whenever possible. 

#     t1  - very simple table

#     t_many_col_types - table with nearly all available column types

#     t9  - table with nearly all available column types

#

# The structure and the content of these tables can be found in

#     include/ps_create.inc  CREATE TABLE ...
@@ -124,16 +124,47 @@ set @arg04=2; 
--disable_warnings

drop table if exists t2;

--enable_warnings

# t2 will be of table type 'MYISAM'

create table t2 as select a,b from t1 ;

prepare stmt1 from 'update t1 set a=? where b=?

                    and a in (select ? from t2

                              where b = ? or a = ?)';

--enable_info

execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04 ;

--disable_info

select a,b from t1 where a = @arg00 ;

prepare stmt1 from 'update t1 set a=? where b=?

                    and a not in (select ? from t2

                              where b = ? or a = ?)';

--enable_info

execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ;

--disable_info

select a,b from t1 order by a ;

drop table t2 ;

# t2 is now of table type '$type'

# The test battery for table type 'MERGE' gets here only a 'MYISAM' table

#

# Test UPDATE with SUBQUERY in prepared mode

#

eval create table t2

(

  a int, b varchar(30),

  primary key(a)

) engine = $type ;

insert into t2(a,b) select a, b from t1 ;

prepare stmt1 from 'update t1 set a=? where b=?

                    and a in (select ? from t2

                              where b = ? or a = ?)';

--enable_info

execute stmt1 using @arg00, @arg01, @arg02, @arg03, @arg04 ;

--disable_info

select a,b from t1 where a = @arg00 ;

prepare stmt1 from 'update t1 set a=? where b=?

                    and a not in (select ? from t2

                              where b = ? or a = ?)';

--enable_info

execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ;

--disable_info

select a,b from t1 order by a ;

drop table t2 ;
@@ -179,6 +210,46 @@ set @arg01='eight' ; 
prepare stmt1 from 'insert into t1 values(?, ? )';

execute stmt1 using @arg00, @arg01 ;

select a,b from t1 where b = @arg01;

# cases derived from client_test.c: test_null()

set @NULL= null ;

set @arg00= 'abc' ;

# execute must fail, because first column is primary key (-> not null)

--error 1048

execute stmt1 using @NULL, @NULL ;

--error 1048

execute stmt1 using @NULL, @NULL ;

--error 1048

execute stmt1 using @NULL, @arg00 ;

--error 1048

execute stmt1 using @NULL, @arg00 ;

let $1 = 2;

while ($1)

{

  eval set @arg01= 10000 + $1 ;

  execute stmt1 using @arg01, @arg00 ;

  dec $1;

}

select * from t1 where a > 10000 order by a ;

delete from t1 where a > 10000 ;

let $1 = 2;

while ($1)

{

  eval set @arg01= 10000 + $1 ;

  execute stmt1 using @arg01, @NULL ;

  dec $1;

}

select * from t1 where a > 10000 order by a ;

delete from t1 where a > 10000 ;

let $1 = 10;

while ($1)

{

  eval set @arg01= 10000 + $1 ;

  execute stmt1 using @arg01, @arg01 ;

  dec $1;

}

select * from t1 where a > 10000 order by a ;

delete from t1 where a > 10000 ;





## insert with two rows in values part

set @arg00=81 ;
@@ -208,6 +279,22 @@ set @arg01=1 ; 
--error 1062

execute stmt1 using @arg00, @arg01;



## insert, autoincrement column and ' SELECT LAST_INSERT_ID() '

# cases derived from client_test.c: test_bug3117()

--disable_warnings

drop table if exists t2 ;

--enable_warnings

# The test battery for table type 'MERGE' gets here only a 'MYISAM' table

eval create table t2 (id int auto_increment primary key) 

ENGINE= $type ;

prepare stmt1 from ' select last_insert_id() ' ;

insert into t2 values (NULL) ;

execute stmt1 ;

insert into t2 values (NULL) ;

# bug#3117

execute stmt1 ;

drop table t2 ;



## many parameters

set @1000=1000 ;

set @x1000_2="x1000_2" ;
@@ -237,3 +324,34 @@ delete from t1 where a >= 1000 ; 
## replace

--error 1295

prepare stmt1 from ' replace into t1 (a,b) select 100, ''hundred'' ';





## multi table statements

--disable_query_log

select '------ multi table tests ------' as test_sequence ;

--enable_query_log

# cases derived from client_test.c: test_multi

delete from t1 ;

delete from t9 ;

insert into t1(a,b) values (1, 'one'), (2, 'two'), (3, 'three') ;

insert into t9 (c1,c21)

  values (1, 'one'), (2, 'two'), (3, 'three') ;

prepare stmt_delete from " delete t1, t9 

  from t1, t9 where t1.a=t9.c1 and t1.b='updated' ";

prepare stmt_update from " update t1, t9 

  set t1.b='updated', t9.c21='updated'

  where t1.a=t9.c1 and t1.a=? ";

prepare stmt_select1 from " select a, b from t1 order by a" ;

prepare stmt_select2 from " select c1, c21 from t9 order by c1" ;

set @arg00= 1 ;

let $1= 3 ;

while ($1)

{

  execute stmt_update using @arg00 ;

  execute stmt_delete ;

  execute stmt_select1 ;

  execute stmt_select2 ;

  set @arg00= @arg00 + 1 ;

  dec $1 ;

}