Commit 6b819860 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 

into bk-internal.mysql.com:/users/rburnett/bug9721


BitKeeper/etc/logging_ok:
  auto-union
parents 779ac9cf 9b2078d5

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ jani@dsl-jkl1657.dial.inet.fi 
jani@dsl-kpogw4gb5.dial.inet.fi

jani@hynda.(none)

jani@hynda.mysql.fi

jani@ibmlab.site

jani@janikt.pp.saunalahti.fi

jani@rhols221.adsl.netsonic.fi

jani@rhols221.arenanet.fi
@@ -215,6 +216,7 @@ serg@serg.mysql.com 
serg@sergbook.mylan

serg@sergbook.mysql.com

sergefp@mysql.com

shuichi@mysql.com

sinisa@rhols221.adsl.netsonic.fi

stewart@mysql.com

svoj@mysql.com

configure.in

+11 −2
Original line number Diff line number Diff line
@@ -2500,14 +2500,14 @@ AC_DIVERT_PUSH(0) 


define(CHARSETS_AVAILABLE0,binary)

define(CHARSETS_AVAILABLE1,armscii8 ascii big5 cp1250 cp1251 cp1256 cp1257)

define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 dec8 euckr gb2312 gbk geostd8)

define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 cp932 dec8 euckr gb2312 gbk geostd8)

define(CHARSETS_AVAILABLE3,greek hebrew hp8 keybcs2 koi8r koi8u)

define(CHARSETS_AVAILABLE4,latin1 latin2 latin5 latin7 macce macroman)

define(CHARSETS_AVAILABLE5,sjis swe7 tis620 ucs2 ujis utf8)



DEFAULT_CHARSET=latin1

CHARSETS_AVAILABLE="CHARSETS_AVAILABLE0 CHARSETS_AVAILABLE1 CHARSETS_AVAILABLE2 CHARSETS_AVAILABLE3 CHARSETS_AVAILABLE4 CHARSETS_AVAILABLE5"

CHARSETS_COMPLEX="big5 cp1250 euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"

CHARSETS_COMPLEX="big5 cp1250 cp932 euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"



AC_DIVERT_POP
@@ -2596,6 +2596,11 @@ do 
    cp866)

      AC_DEFINE(HAVE_CHARSET_cp866, 1, [Define to enable charset cp866])

      ;;

    cp932)

      AC_DEFINE(HAVE_CHARSET_cp932, 1, [Define to enable charset cp932])

      AC_DEFINE([USE_MB], 1, [Use multi-byte character routines])

      AC_DEFINE(USE_MB_IDENT, 1)

      ;;

    dec8)

      AC_DEFINE(HAVE_CHARSET_dec8, 1, [Define to enable charset dec8])

      ;;
@@ -2734,6 +2739,10 @@ case $default_charset in 
      default_charset_default_collation="cp866_general_ci"

      default_charset_collations="cp866_general_ci cp866_bin"

      ;;

    cp932)

      default_charset_default_collation="cp932_japanese_ci"

      default_charset_collations="cp932_japanese_ci cp932_bin"

      ;;

    dec8)

      default_charset_default_collation="dec8_swedish_ci"

      default_charset_collations="dec8_swedish_ci dec8_bin"

include/m_ctype.h

+2 −0
Original line number Diff line number Diff line
@@ -230,6 +230,8 @@ typedef struct charset_info_st 
extern CHARSET_INFO my_charset_bin;

extern CHARSET_INFO my_charset_big5_chinese_ci;

extern CHARSET_INFO my_charset_big5_bin;

extern CHARSET_INFO my_charset_cp932_japanese_ci;

extern CHARSET_INFO my_charset_cp932_bin;

extern CHARSET_INFO my_charset_euckr_korean_ci;

extern CHARSET_INFO my_charset_euckr_bin;

extern CHARSET_INFO my_charset_gb2312_chinese_ci;

innobase/include/lock0lock.h

+9 −2
Original line number Diff line number Diff line
@@ -530,8 +530,15 @@ lock_rec_print( 
Prints info of locks for all transactions. */



void

lock_print_info(

/*============*/

lock_print_info_summary(

/*====================*/

	FILE*	file);	/* in: file where to print */

/*************************************************************************

Prints info of locks for each transaction. */



void

lock_print_info_all_transactions(

/*=============================*/

	FILE*	file);	/* in: file where to print */

/*************************************************************************

Validates the lock queue on a table. */

innobase/include/srv0srv.h

+5 −1
Original line number Diff line number Diff line
@@ -398,7 +398,11 @@ Outputs to a file the output of the InnoDB Monitor. */ 
void

srv_printf_innodb_monitor(

/*======================*/

	FILE*	file);	/* in: output stream */

	FILE*	file,		/* in: output stream */

	ulint*	trx_start,	/* out: file position of the start of

				the list of active transactions */

	ulint*	trx_end);	/* out: file position of the end of

				the list of active transactions */





/* Types for the threads existing in the system. Threads of types 4 - 9