Commit 5ec8d08a authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 3e5491e6 75108949

configure.in

+8 −8
Original line number Diff line number Diff line
@@ -442,33 +442,33 @@ PS=$ac_cv_path_PS 
# Linux style

if $PS p $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS p \$\$PID | grep \$\$MYSQLD > /dev/null"

  FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"

# Solaris

elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -p \$\$PID | grep \$\$MYSQLD > /dev/null"

  FIND_PROC="$PS -p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"

# BSD style

elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -uaxww | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

  FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

# SysV style

elif $PS -ef 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -ef | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

  FIND_PROC="$PS -ef | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

# Do anybody use this?

elif $PS $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS \$\$PID | grep \$\$MYSQLD > /dev/null"

  FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"

else

  case $SYSTEM_TYPE in

    *freebsd*)

      FIND_PROC="$PS p \$\$PID | grep \$\$MYSQLD > /dev/null"

      FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"

      ;;

    *darwin*)

      FIND_PROC="$PS -uaxww | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

      FIND_PROC="$PS -uaxww | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

      ;;

    *cygwin*)

      FIND_PROC="$PS -e | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

      FIND_PROC="$PS -e | grep -v grep | grep \$\$MYSQLD | grep \" \$\$PID \" > /dev/null"

      ;;

    *netware*)

      FIND_PROC=

include/my_global.h

+0 −6
Original line number Diff line number Diff line
@@ -285,13 +285,7 @@ C_MODE_END 
# endif

#endif /* TIME_WITH_SYS_TIME */

#ifdef HAVE_UNISTD_H

#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__APPLE__)

#define crypt unistd_crypt

#endif

#include <unistd.h>

#ifdef HAVE_OPENSSL

#undef crypt

#endif

#endif

#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)

#undef HAVE_ALLOCA

mysql-test/r/heap.result

+5 −0
Original line number Diff line number Diff line
@@ -696,3 +696,8 @@ drop table t1; 
create table t1 (a int not null, b int not null auto_increment,

primary key(a, b)) engine=heap;

ERROR 42000: Incorrect table definition; there can be only one auto column and it must be defined as a key

create table t1 (c char(255), primary key(c(90)));

insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1

drop table t1;

mysql-test/r/key.result

+25 −0
Original line number Diff line number Diff line
@@ -329,3 +329,28 @@ ERROR 42S21: Duplicate column name 'c1' 
alter table t1 add key (c1,c1,c2);

ERROR 42S21: Duplicate column name 'c1'

drop table t1;

create table t1 (a varchar(10), b varchar(10), key(a(10),b(10)));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(10) default NULL,

  `b` varchar(10) default NULL,

  KEY `a` (`a`,`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 modify b varchar(20);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(10) default NULL,

  `b` varchar(20) default NULL,

  KEY `a` (`a`,`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 modify a varchar(20);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(20) default NULL,

  `b` varchar(20) default NULL,

  KEY `a` (`a`,`b`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

mysql-test/r/type_varchar.result

+50 −27
Original line number Diff line number Diff line
@@ -126,13 +126,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	258	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	258	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	258	NULL	2	Using where; Using index

alter table t1 change v v varchar(256);

select * from t1 where v like 'This is a test' order by v;

v
@@ -150,13 +150,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	259	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	259	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	259	NULL	2	Using where; Using index

alter table t1 change v v varchar(257);

select * from t1 where v like 'This is a test' order by v;

v
@@ -174,13 +174,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	260	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	260	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	260	NULL	2	Using where; Using index

alter table t1 change v v varchar(258);

select * from t1 where v like 'This is a test' order by v;

v
@@ -198,13 +198,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	261	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	261	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	261	NULL	2	Using where; Using index

alter table t1 change v v varchar(259);

select * from t1 where v like 'This is a test' order by v;

v
@@ -222,13 +222,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	262	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	262	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	262	NULL	2	Using where; Using index

alter table t1 change v v varchar(258);

select * from t1 where v like 'This is a test' order by v;

v
@@ -246,13 +246,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	261	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	261	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	261	NULL	2	Using where; Using index

alter table t1 change v v varchar(257);

select * from t1 where v like 'This is a test' order by v;

v
@@ -270,13 +270,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	260	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	260	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	260	NULL	2	Using where; Using index

alter table t1 change v v varchar(256);

select * from t1 where v like 'This is a test' order by v;

v
@@ -294,13 +294,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	259	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	259	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	259	NULL	2	Using where; Using index

alter table t1 change v v varchar(255);

select * from t1 where v like 'This is a test' order by v;

v
@@ -318,13 +318,13 @@ Some sample data 
Some samples

explain select * from t1 where v like 'This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	3	Using where; Using filesort

1	SIMPLE	t1	range	v	v	258	NULL	3	Using where; Using index

explain select * from t1 where v='This is a test' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	257	const	3	Using where

1	SIMPLE	t1	ref	v	v	258	const	3	Using where; Using index

explain select * from t1 where v like 'S%' order by v;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	257	NULL	2	Using where; Using filesort

1	SIMPLE	t1	range	v	v	258	NULL	2	Using where; Using index

alter table t1 change v v varchar(254);

select * from t1 where v like 'This is a test' order by v;

v
@@ -392,3 +392,26 @@ group by t1.b, t1.a; 
a	b	min(t1.b)

22	NULL	NULL

drop table t1, t2;

create table t1 (f1 varchar(65500));

create index index1 on t1(f1(10));

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `f1` varchar(65500) default NULL,

  KEY `index1` (`f1`(10))

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 modify f1 varchar(255);

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `f1` varchar(255) default NULL,

  KEY `index1` (`f1`(10))

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 modify f1 tinytext;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `f1` tinytext,

  KEY `index1` (`f1`(10))

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;