Commit c36e3e5d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1-ndb
parents 506a7bdd 60cb0e5f

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -780,3 +780,6 @@ ndb/src/common/mgmcommon/printConfig/*.d 
ndb/src/mgmclient/test_cpcd/*.d

*.d

libmysqld/examples/client_test.c

sql/test_time

sql/mysql_tzinfo_to_sql

libmysqld/tztime.cc

acconfig.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
#undef HAVE_CHARSET_euckr

#undef HAVE_CHARSET_gb2312

#undef HAVE_CHARSET_gbk

#undef HAVE_CHARSET_geostd8

#undef HAVE_CHARSET_greek

#undef HAVE_CHARSET_hebrew

#undef HAVE_CHARSET_hp8

configure.in

+30 −3
Original line number Diff line number Diff line
@@ -2337,7 +2337,7 @@ dnl you must also create strings/ctype-$charset_name.c 
AC_DIVERT_PUSH(0)



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

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

define(CHARSETS_AVAILABLE2,cp850 cp852 cp866 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)
@@ -2444,6 +2444,9 @@ do 
      AC_DEFINE(USE_MB)

      AC_DEFINE(USE_MB_IDENT)

      ;;

    geostd8)

      AC_DEFINE(HAVE_CHARSET_geostd8)

      ;;

    greek)

      AC_DEFINE(HAVE_CHARSET_greek)

      ;;
@@ -2572,6 +2575,10 @@ case $default_charset in 
      default_charset_default_collation="gbk_chinese_ci"

      default_charset_collations="gbk_chinese_ci gbk_bin"

      ;;

    geostd8)

      default_charset_default_collation="geostd8_general_ci"

      default_charset_collations="geostd8_general_ci geostd8_bin"

      ;;

    greek)

      default_charset_default_collation="greek_general_ci"

      default_charset_collations="greek_general_ci greek_bin"
@@ -2634,7 +2641,17 @@ case $default_charset in 
      ;;

    ucs2)

      default_charset_default_collation="ucs2_general_ci"

      default_charset_collations="ucs2_general_ci ucs2_bin"

      define(UCSC1, ucs2_general_ci ucs2_bin)

      define(UCSC2, ucs2_czech_ci ucs2_danish_ci)

      define(UCSC3, ucs2_estonian_ci ucs2_icelandic_ci)

      define(UCSC4, ucs2_latvian_ci ucs2_lithuanian_ci)

      define(UCSC5, ucs2_polish_ci ucs2_romanian_ci)

      define(UCSC6, ucs2_slovak_ci ucs2_slovenian_ci)

      define(UCSC7, ucs2_spanish2_ci ucs2_spanish_ci)

      define(UCSC8, ucs2_swedish_ci ucs2_turkish_ci)

      define(UCSC9, ucs2_unicode_ci)

      UCSC="UCSC1 UCSC2 UCSC3 UCSC4 UCSC5 UCSC6 UCSC7 UCSC8 UCSC9"

      default_charset_collations="$UCSC"

      ;;

    ujis)

      default_charset_default_collation="ujis_japanese_ci"
@@ -2642,7 +2659,17 @@ case $default_charset in 
      ;;

    utf8)

      default_charset_default_collation="utf8_general_ci"

      default_charset_collations="utf8_general_ci utf8_bin"

      define(UTFC1, utf8_general_ci utf8_bin)

      define(UTFC2, utf8_czech_ci utf8_danish_ci)

      define(UTFC3, utf8_estonian_ci utf8_icelandic_ci)

      define(UTFC4, utf8_latvian_ci utf8_lithuanian_ci)

      define(UTFC5, utf8_polish_ci utf8_romanian_ci)

      define(UTFC6, utf8_slovak_ci utf8_slovenian_ci)

      define(UTFC7, utf8_spanish2_ci utf8_spanish_ci)

      define(UTFC8, utf8_swedish_ci utf8_turkish_ci)

      define(UTFC9, utf8_unicode_ci)

      UTFC="UTFC1 UTFC2 UTFC3 UTFC4 UTFC5 UTFC6 UTFC7 UTFC8 UTFC9"

      default_charset_collations="$UTFC"

      ;;

    *)

      AC_MSG_ERROR([Charset $cs not available. (Available are: $CHARSETS_AVAILABLE).

include/my_global.h

+8 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,14 @@ do { doubleget_union _tmp; \ 


#endif /* sint2korr */



/*

  Macro for reading 32-bit integer from network byte order (big-endian)

  from unaligned memory location.

*/

#define int4net(A)        (int32) (((uint32) ((uchar) (A)[3]))        |\

				  (((uint32) ((uchar) (A)[2])) << 8)  |\

				  (((uint32) ((uchar) (A)[1])) << 16) |\

				  (((uint32) ((uchar) (A)[0])) << 24))

/*

  Define-funktions for reading and storing in machine format from/to

  short/long to/from some place in memory V should be a (not

include/mysqld_error.h

+3 −1
Original line number Diff line number Diff line
@@ -314,4 +314,6 @@ 
#define ER_UNSUPPORTED_PS 1295

#define ER_GET_ERRMSG 1296

#define ER_GET_TEMPORARY_ERRMSG 1297

#define ER_ERROR_MESSAGES 298
 
#define ER_UNKNOWN_TIME_ZONE 1298

#define ER_WARN_INVALID_TIMESTAMP 1299

#define ER_ERROR_MESSAGES 300