Commit 2ee0dc09 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
parents a964b182 dd3cfa8d

VC++Files/libmysqld/libmysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBMYSQLD_EXPORTS" /YX /FD /GZ /c

# ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c

# ADD CPP /nologo /MT /W3 /Z7 /Od /I "../include" /I "../libmysqld" /I "../sql" /I "../regex" /I "../bdb/build_win32" /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "SAFEMALLOC" /D "HAVE_BERKELEY_DB" /D "USE_SYMDIR" /D "SIGNAL_WITH_VIO_CLOSE" /D "HAVE_DLOPEN" /D "EMBEDDED_LIBRARY" /D "HAVE_INNOBASE_DB" /D "USE_TLS" /D "__WIN__" /FD /GZ /c

# SUBTRACT CPP /X /Fr

# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

client/mysql.cc

+11 −1
Original line number Diff line number Diff line
@@ -330,6 +330,16 @@ static sig_handler mysql_end(int sig); 
int main(int argc,char *argv[])

{

  char buff[80];

  char *defaults, *extra_defaults;

  char *emb_argv[3];

  int emb_argc= 1;



  emb_argv[0]= argv[0];

  get_defaults_files(argc, argv, &defaults, &extra_defaults);

  if (defaults)

    emb_argv[emb_argc++]= defaults;

  if (extra_defaults)

    emb_argv[emb_argc++]= extra_defaults;



  MY_INIT(argv[0]);

  DBUG_ENTER("main");
@@ -375,7 +385,7 @@ int main(int argc,char *argv[]) 
    my_end(0);

    exit(1);

  }

  if (mysql_server_init(0, NULL, (char**) server_default_groups))

  if (mysql_server_init(emb_argc, emb_argv, (char**) server_default_groups))

  {

    free_defaults(defaults_argv);

    my_end(0);

config/ac-macros/character_sets.m4

+20 −2
Original line number Diff line number Diff line
@@ -7,14 +7,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 eucjp_ms 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 eucjp_ms euckr gb2312 gbk latin1 latin2 sjis tis620 ucs2 ujis utf8"



AC_DIVERT_POP
@@ -103,9 +103,19 @@ 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])

      ;;

    eucjp_ms)

      AC_DEFINE(HAVE_CHARSET_eucjp_ms, 1, [Define to enable charset eucjp_ms])

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

      AC_DEFINE(USE_MB_IDENT, 1)

      ;;

    euckr)

      AC_DEFINE(HAVE_CHARSET_euckr, 1, [Define to enable charset euckr])

      AC_DEFINE([USE_MB], [1], [Use multi-byte character routines])
@@ -241,10 +251,18 @@ 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"

      ;;

    eucjp_ms)

      default_charset_default_collation="eucjp_ms_japanese_ci"

      default_charset_collations="eucjp_ms_japanese_ci ujis_bin"

      ;;

    euckr)

      default_charset_default_collation="euckr_korean_ci"

      default_charset_collations="euckr_korean_ci euckr_bin"

include/m_ctype.h

+4 −0
Original line number Diff line number Diff line
@@ -230,6 +230,10 @@ 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_eucjp_ms_japanese_ci;

extern CHARSET_INFO my_charset_eucjp_ms_bin;

extern CHARSET_INFO my_charset_euckr_korean_ci;

extern CHARSET_INFO my_charset_euckr_bin;

extern CHARSET_INFO my_charset_gb2312_chinese_ci;

include/my_sys.h

+2 −0
Original line number Diff line number Diff line
@@ -769,6 +769,8 @@ extern void reset_root_defaults(MEM_ROOT *mem_root, uint block_size, 
extern char *strdup_root(MEM_ROOT *root,const char *str);

extern char *strmake_root(MEM_ROOT *root,const char *str,uint len);

extern char *memdup_root(MEM_ROOT *root,const char *str,uint len);

extern void get_defaults_files(int argc, char **argv,

                               char **defaults, char **extra_defaults);

extern int load_defaults(const char *conf_file, const char **groups,

			 int *argc, char ***argv);

extern int process_default_option_files(const char *conf_file,