Commit 97bfd41f authored by unknown's avatar unknown
Browse files

Don't use PATH_MAX for FN_REFLEN as this uses too much stack space 

Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk


BitKeeper/etc/ignore:
  added libmysqld/ha_blackhole.cc
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Delete: libmysqld/ha_blackhole.cc
include/my_global.h:
  Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
  (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
mysql-test/r/federated.result:
  Update results after error message changes
mysql-test/r/grant.result:
  Update results after error message changes
mysql-test/r/grant2.result:
  Update results after error message changes
sql/ha_federated.cc:
  Fix error messages to be more consistent
sql/mysql_priv.h:
  Stack size to have when opening a table
  (This was needed on x86 64 bit Linux)
sql/share/errmsg.txt:
  Remove quotes around error string for federated as two quotes in the output looks strange
sql/sql_base.cc:
  More correct stack size
sql/sql_parse.cc:
  Set thread_stack before store_globals()
sql/unireg.h:
  More correct MAX_DBKEY_LENGTH
parent f4431619

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1268,3 +1268,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

libmysqld/ha_blackhole.cc

include/my_global.h

+0 −4
Original line number Diff line number Diff line
@@ -574,11 +574,7 @@ 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/federated.result

+2 −2
Original line number Diff line number Diff line
@@ -40,14 +40,14 @@ CREATE TABLE federated.t1 ( 
    )

ENGINE="FEDERATED" DEFAULT CHARSET=latin1

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t3';

ERROR HY000: Can't create federated table. Foreign data src error : ': 1146 : Table 'federated.t3' doesn't exist'

ERROR HY000: Can't create federated table. Foreign data src error:  error: 1146  'Table 'federated.t3' doesn't exist'

CREATE TABLE federated.t1 (

`id` int(20) NOT NULL,

`name` varchar(32) NOT NULL default ''

    )

ENGINE="FEDERATED" DEFAULT CHARSET=latin1

CONNECTION='mysql://user:pass@127.0.0.1:SLAVE_PORT/federated/t1';

ERROR HY000: Unable to connect to foreign data source - database ' database federated username user hostname 127.0.0.1'!

ERROR HY000: Unable to connect to foreign data source: database: 'federated'  username: 'user'  hostname: '127.0.0.1'

DROP TABLE IF EXISTS federated.t1;

Warnings:

Note	1051	Unknown table 't1'

mysql-test/r/grant.result

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ Grants for drop_user@localhost 
GRANT USAGE ON *.* TO 'drop_user'@'localhost'

drop user drop_user@localhost;

revoke all privileges, grant option from drop_user@localhost;

ERROR HY000: Can't revoke all privileges, grant for one or more of the requested users

ERROR HY000: Can't revoke all privileges for one or more of the requested users

grant select(a) on test.t1 to drop_user1@localhost;

grant select on test.t1 to drop_user2@localhost;

grant select on test.* to drop_user3@localhost;
@@ -247,7 +247,7 @@ drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost, 
drop_user4@localhost;

revoke all privileges, grant option from drop_user1@localhost, drop_user2@localhost,

drop_user3@localhost, drop_user4@localhost;

ERROR HY000: Can't revoke all privileges, grant for one or more of the requested users

ERROR HY000: Can't revoke all privileges for one or more of the requested users

drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,

drop_user4@localhost;

ERROR HY000: Operation DROP USER failed for 'drop_user1'@'localhost','drop_user2'@'localhost','drop_user3'@'localhost','drop_user4'@'localhost'

mysql-test/r/grant2.result

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ flush privileges; 
show grants for 'mysqltest_1';

ERROR 42000: There is no such grant defined for user 'mysqltest_1' on host '%'

revoke all privileges, grant option from 'mysqltest_1';

ERROR HY000: Can't revoke all privileges, grant for one or more of the requested users

ERROR HY000: Can't revoke all privileges for one or more of the requested users

drop user 'mysqltest_1';

select host,db,user from mysql.db where user = 'mysqltest_1' order by host,db,user;

host	db	user