Commit d7d3be6b authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/mydev/mysql-4.1-4100
parents 2855192e e2bf6b04

BUILD/SETUP.sh

+2 −2
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch 
c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"



base_max_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-bdb --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio --with-embedded-server"

max_no_es_configs="$max_leave_isam_configs --without-isam"

max_configs="$max_no_es_configs --with-embedded-server"

client/mysqladmin.cc

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
	option_wait=1;

    }

    else

      option_wait= ~0;

      option_wait= ~(uint)0;

    break;

  case '?':

  case 'I':					/* Info */

client/sql_string.cc

+2 −1
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ 


/* This file is originally from the mysql distribution. Coded by monty */



#include <my_global.h>



#ifdef USE_PRAGMA_IMPLEMENTATION

#pragma implementation				// gcc: Class implementation

#endif



#include <my_global.h>

#include <my_sys.h>

#include <m_string.h>

#include <m_ctype.h>

mysql-test/r/func_str.result

+6 −0
Original line number Diff line number Diff line
@@ -783,3 +783,9 @@ id aes_decrypt(str, 'bar') 
1	foo

2	NULL

DROP TABLE t1, t2;

select field(0,NULL,1,0), field("",NULL,"bar",""), field(0.0,NULL,1.0,0.0);

field(0,NULL,1,0)	field("",NULL,"bar","")	field(0.0,NULL,1.0,0.0)

3	3	3

select field(NULL,1,2,NULL), field(NULL,1,2,0);

field(NULL,1,2,NULL)	field(NULL,1,2,0)

0	0

mysql-test/r/lowercase_table2.result

+6 −6
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ T1 CREATE TABLE `T1` ( 
RENAME TABLE T1 TO T2;

SHOW TABLES LIKE "T2";

Tables_in_test (T2)

t2

T2

SELECT * FROM t2;

a

1
@@ -83,25 +83,25 @@ t3 
RENAME TABLE T3 TO T1;

SHOW TABLES LIKE "T1";

Tables_in_test (T1)

t1

T1

ALTER TABLE T1 add b int;

SHOW TABLES LIKE "T1";

Tables_in_test (T1)

t1

T1

ALTER TABLE T1 RENAME T2;

SHOW TABLES LIKE "T2";

Tables_in_test (T2)

t2

T2

LOCK TABLE T2 WRITE;

ALTER TABLE T2 drop b;

SHOW TABLES LIKE "T2";

Tables_in_test (T2)

t2

T2

UNLOCK TABLES;

RENAME TABLE T2 TO T1;

SHOW TABLES LIKE "T1";

Tables_in_test (T1)

t1

T1

SELECT * from T1;

a

1