Commit 87fba518 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.1-4100 

into mysql.com:/home/mydev/mysql-5.0-5000


BUILD/SETUP.sh:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 1ea2bc38 a271a6c8

BUILD/SETUP.sh

+6 −4
Original line number Diff line number Diff line
@@ -6,12 +6,15 @@ then 
  exit 1

fi



prefix_configs="--prefix=/usr/local/mysql"

just_print=

just_configure=

full_debug=

while test $# -gt 0

do

  case "$1" in

  --prefix=* ) prefix_configs="$1"; shift ;;

  --with-debug=full ) full_debug="=full"; shift ;;

  -c | --just-configure ) just_configure=1; shift ;;

  -n | --just-print | --print ) just_print=1; shift ;;

  -h | --help ) cat <<EOF; exit 0 ;;
@@ -19,12 +22,11 @@ Usage: $0 [-h|-n] [configure-options] 
  -h, --help              Show this help message.

  -n, --just-print        Don't actually run any commands; just print them.

  -c, --just-configure    Stop after running configure.



Any other options will be passed directly to configure.

  --with-debug=full       Build with full debug.

  --prefix=path           Build with prefix 'path'.



Note:  this script is intended for internal use by MySQL developers.

EOF

  --with-debug=full ) full_debug="=full"; shift ;;

  * )

    echo "Unknown option '$1'"

    exit 1
@@ -70,7 +72,7 @@ debug_extra_cflags="-O1 -Wuninitialized" 
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"

amd64_cxxflags="-DBIG_TABLES"



base_configs="--prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"

base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline"

static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"

amd64_configs=""

alpha_configs=""	# Not used yet

include/my_global.h

+4 −0
Original line number Diff line number Diff line
@@ -530,7 +530,11 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#define FN_LEN		256	/* Max file name len */

#define FN_HEADLEN	253	/* Max length of filepart of file name */

#define FN_EXTLEN	20	/* Max length of extension (part of FN_LEN) */

#ifdef PATH_MAX

#define FN_REFLEN       PATH_MAX/* Max length of full path-name */

#else

#define FN_REFLEN	512	/* Max length of full path-name */

#endif

#define FN_EXTCHAR	'.'

#define FN_HOMELIB	'~'	/* ~/ is used as abbrev for home dir */

#define FN_CURLIB	'.'	/* ./ is used as abbrev for current dir */

mysql-test/r/lowercase_table2.result

+7 −7
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1,t2,T1,T2,t3,T3,tT;

DROP TABLE IF EXISTS t1,t2,T1,T2,t3,T3;

DROP DATABASE IF EXISTS `TEST_$1`;

DROP DATABASE IF EXISTS `test_$1`;

CREATE TABLE T1 (a int);
@@ -131,13 +131,13 @@ show tables like 't1%'; 
Tables_in_test (t1%)

t1

drop table t1;

create temporary table tT(a int(11), b varchar(8));

insert into tT values (1, 'abc');

select * from tT;

create temporary table T1(a int(11), b varchar(8));

insert into T1 values (1, 'abc');

select * from T1;

a	b

1	abc

alter table tT add index (a);

select * from tT;

alter table T1 add index (a);

select * from T1;

a	b

1	abc

drop table tT;
 
drop table T1;

mysql-test/r/order_by.result

+17 −0
Original line number Diff line number Diff line
@@ -778,3 +778,20 @@ sid wnid 
39560	01019090000

37994	01019090000

drop table t1;

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (2), (1), (1), (2), (1);

SELECT a FROM t1 ORDER BY a;

a

1

1

1

2

2

(SELECT a FROM t1) ORDER BY a;

a

1

1

1

2

2

DROP TABLE t1;

mysql-test/t/lowercase_table2.test

+7 −7
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ show variables like "lower_case_table_names"; 
enable_query_log;



--disable_warnings

DROP TABLE IF EXISTS t1,t2,T1,T2,t3,T3,tT;

DROP TABLE IF EXISTS t1,t2,T1,T2,t3,T3;

DROP DATABASE IF EXISTS `TEST_$1`;

DROP DATABASE IF EXISTS `test_$1`;

--enable_warnings
@@ -105,9 +105,9 @@ drop table t1; 
# Bug #7261: Alter table loses temp table

#



create temporary table tT(a int(11), b varchar(8));

insert into tT values (1, 'abc');

select * from tT;

alter table tT add index (a);

select * from tT;

drop table tT;
 
create temporary table T1(a int(11), b varchar(8));

insert into T1 values (1, 'abc');

select * from T1;

alter table T1 add index (a);

select * from T1;

drop table T1;