Commit 4c2f929e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-5.0-bug10932 

into  mysql.com:/home/mydev/mysql-5.1-bug10932


include/myisam.h:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/unireg.h:
  Auto merged
configure.in:
  SCCS merged
parents 002101a4 f7730560

config/ac-macros/misc.m4

+21 −0
Original line number Diff line number Diff line
@@ -693,6 +693,27 @@ dnl --------------------------------------------------------------------------- 
dnl END OF MYSQL_CHECK_BIG_TABLES SECTION

dnl ---------------------------------------------------------------------------





dnl ---------------------------------------------------------------------------

dnl Macro: MYSQL_CHECK_MAX_INDEXES

dnl Sets MAX_INDEXES

dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [

  AC_ARG_WITH([max-indexes],

              [

  --with-max-indexes=\#      Sets the maximum number of indexes per table, default 64],

              [max_indexes="$withval"],

              [max_indexes=64])

  AC_MSG_CHECKING([max indexes per table])

  AC_DEFINE_UNQUOTED([MAX_INDEXES], [$max_indexes],

                     [Maximum number of indexes per table])

  AC_MSG_RESULT([$max_indexes])

])

dnl ---------------------------------------------------------------------------

dnl END OF MYSQL_CHECK_MAX_INDEXES SECTION

dnl ---------------------------------------------------------------------------





dnl MYSQL_NEEDS_MYSYS_NEW

AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],

[AC_CACHE_CHECK([needs mysys_new helpers], mysql_use_mysys_new,

configure.in

+1 −0
Original line number Diff line number Diff line
@@ -2365,6 +2365,7 @@ AC_SUBST(readline_link) 
AC_SUBST(readline_h_ln_cmd)



MYSQL_CHECK_BIG_TABLES

MYSQL_CHECK_MAX_INDEXES



MYSQL_STORAGE_ENGINE(innobase,,innodb,,,,storage/innobase,ha_innodb.o,[ dnl

  \$(top_builddir)/storage/innobase/usr/libusr.a dnl

include/myisam.h

+8 −5
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ extern "C" { 
#include "my_handler.h"

#include <plugin.h>



	/* defines used by myisam-funktions */



/*

  There is a hard limit for the maximum number of keys as there are only

  8 bits in the index file header for the number of keys in a table.
@@ -46,14 +44,19 @@ extern "C" { 
  running myisamchk compiled for 128 keys on a table with 255 keys.

*/

#define MI_MAX_POSSIBLE_KEY         255             /* For myisam_chk */

#if MAX_INDEXES > MI_MAX_POSSIBLE_KEY

#define MI_MAX_KEY                  MI_MAX_POSSIBLE_KEY /* Max allowed keys */

#else

#define MI_MAX_KEY                  MAX_INDEXES         /* Max allowed keys */

#endif



#define MI_MAX_POSSIBLE_KEY_BUFF    (1024+6+6)      /* For myisam_chk */

/*

  The following defines can be increased if necessary.

  BUT: MI_MAX_KEY must be <= MI_MAX_POSSIBLE_KEY.

  But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.

*/

#define MI_MAX_KEY                  64              /* Max allowed keys */

#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */

#define MI_MAX_KEY_SEG              16              /* Max segments for key */

#define MI_MAX_KEY_LENGTH           1000



#define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)

#define MI_MAX_MSG_BUF      1024 /* used in CHECK TABLE, REPAIR TABLE */

mysql-test/r/mysqltest.result

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ root@localhost 
--------------------------------------------------------------------------------

this will be executed

this will be executed

mysqltest: At line 2: query 'create table t1 (a int primary key);

mysqltest: At line 3: query 'create table t1 (a int primary key);

insert into t1 values (1);

select 'select-me';

insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1

mysql-test/r/rpl_deadlock.result

+1 −1
Original line number Diff line number Diff line
@@ -83,5 +83,5 @@ a 
22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	#	Yes							0		0	18911	#	None		0	No						#

drop table t1,t2,t3,t4;