Commit 8c249ba8 authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg
Browse files

auto-merge

parents 2d41201c d1f5280a

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.66)

AM_INIT_AUTOMAKE(mysql, 5.0.68)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=66

NDB_VERSION_BUILD=68

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/suite/funcs_1/datadict/charset_collation.inc

+13 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#

# The amount and properties of character_sets/collations depend on the

# build type

# 2007-12 MySQL 5.0

# 2007-12 MySQL 5.0, 2008-06 MySQL 5.1

# ---------------------------------------------------------------------

#

# Variant 1 fits to
@@ -33,10 +33,22 @@ 
# Variant 3 fits to

#    version_comment       MySQL Community Server (GPL)

#    version_comment       MySQL Cluster Server (Commercial)

#    version_comment       MySQL Advanced Server (GPL)         5.1

#    version_comment       MySQL Advanced Server (Commercial)  5.1

#

# Difference between variant 3 and 2 is within the collation properties

# IS_COMPILED and SORTLEN.

#

# 2008-06 All time excluded variant is "vanilla".

# How to build "vanilla":

#    ./BUILD/autorun.sh

#    ./configure

#    ./make

# Some properties of "vanilla"

#    version_comment       Source distribution

#    Compared to the variants 1 to 3 a lot of character sets are missing.

#    Example: "ucs2_bin" is in variant 1 to 3 but not in "vanilla".

#

# Created:

# 2007-12-18 mleich - remove the unstable character_set/collation subtests

#                     from include/datadict-master.inc

mysql-test/suite/funcs_1/t/charset_collation_1.test

+4 −2
Original line number Diff line number Diff line
@@ -22,9 +22,11 @@ if (`SELECT EXISTS (SELECT 1 FROM information_schema.collations 
       OR (    @@version_comment NOT LIKE '%Source%'

           AND @@version_comment NOT LIKE '%Enterprise%'

           AND @@version_comment NOT LIKE '%Classic%'

           AND @@version_comment NOT LIKE '%Pushbuild%')`)

           AND @@version_comment NOT LIKE '%Pushbuild%')

       OR (SELECT count(*) = 0 FROM information_schema.collations

                    WHERE collation_name = 'ucs2_bin')`)

{

  skip Test needs Enterprise, Classic , Pushbuild or Source-without-max build;

  skip Test needs Enterprise, Classic , regular Pushbuild or Source-without-max build;

}



--source suite/funcs_1/datadict/charset_collation.inc

mysql-test/suite/funcs_1/t/charset_collation_3.test

+3 −2
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
#



if (`SELECT @@version_comment NOT LIKE '%Community%'

        AND @@version_comment NOT LIKE '%Cluster%'`)

        AND @@version_comment NOT LIKE '%Cluster%'

        AND @@version_comment NOT LIKE '%Advanced%'`)

{

   skip Test needs Community or Cluster build;

   skip Test needs Community, Cluster or Advanced build;

}



--source suite/funcs_1/datadict/charset_collation.inc

mysql-test/suite/funcs_2/charset/charset_master.test

+86 −4
Original line number Diff line number Diff line 
#################################################################################

# Author:  Serge Kozlov                                                         #

# Date:    09/21/2005								#

# Date:    2005-09-21                                                           #

# Purpose: used by ../t/*_charset.test                                          #

# Require: set $engine_type= [NDB,MyISAM,InnoDB,etc] before calling             #

#                                                                               #

# Last modification:  Matthias Leich                                            #

# Date:    2008-07-02                                                           #

# Purpose: Fix Bug#37160 funcs_2: The tests do not check if optional character  #

#                                 sets exist.                                   #

#          Add checking of prerequisites + minor cleanup                        #

#################################################################################



#

#

#



# Check that all character sets needed are available

# Note(mleich):

#    It is intentional that the common solution with

#    "--source include/have_<character set>.inc"

#    is not applied.

#    - We currently do not have such a prerequisite test for every character set

#      /collation needed.

#    - There is also no real value in mentioning the first missing character set

#      /collation within the "skip message" because it is most probably only

#      one of many.

#      

# Hint: 5 character_set_names per source line if possible

if (`SELECT COUNT(*) <> 36 FROM information_schema.character_sets

    WHERE CHARACTER_SET_NAME IN (

    'armscii8', 'ascii'  , 'big5'   , 'binary' , 'cp1250',

    'cp1251'  , 'cp1256' , 'cp1257' , 'cp850'  , 'cp852' ,

    'cp866'   , 'cp932'  , 'dec8'   , 'eucjpms', 'euckr' ,

    'gb2312'  , 'gbk'    , 'geostd8', 'greek'  , 'hebrew',

    'hp8'     , 'keybcs2', 'koi8r'  , 'koi8u'  , 'latin1',

    'latin2'  , 'latin5' , 'latin7' , 'macce'  , 'macroman',

    'sjis'    , 'swe7'   , 'tis620' , 'ucs2'   , 'ujis',

    'utf8'

    )`)

{

   --skip Not all character sets required for this test are present

}

# Check that all collations needed are available

# Hint: 4 collation_names per source line if possible

if (`SELECT COUNT(*) <> 123 FROM information_schema.collations

WHERE collation_name IN (

'armscii8_bin', 'armscii8_general_ci', 'ascii_bin', 'ascii_general_ci',

'big5_bin', 'big5_chinese_ci', 'cp1250_bin', 'cp1250_croatian_ci',

'cp1250_czech_cs', 'cp1250_general_ci', 'cp1251_bin', 'cp1251_bulgarian_ci',

'cp1251_general_ci', 'cp1251_general_cs', 'cp1251_ukrainian_ci', 'cp1256_bin',

'cp1256_general_ci', 'cp1257_bin', 'cp1257_general_ci', 'cp1257_lithuanian_ci',

'cp850_bin', 'cp850_general_ci', 'cp852_bin', 'cp852_general_ci',

'cp866_bin', 'cp866_general_ci', 'cp932_bin', 'cp932_japanese_ci',

'dec8_bin', 'dec8_swedish_ci', 'eucjpms_bin', 'eucjpms_japanese_ci',

'euckr_bin', 'euckr_korean_ci', 'gb2312_bin', 'gb2312_chinese_ci',

'gbk_bin', 'gbk_chinese_ci', 'geostd8_bin', 'geostd8_general_ci',

'greek_bin', 'greek_general_ci', 'hebrew_bin', 'hebrew_general_ci',

'hp8_bin', 'hp8_english_ci', 'keybcs2_bin', 'keybcs2_general_ci',

'koi8r_bin', 'koi8r_general_ci', 'koi8u_bin', 'koi8u_general_ci',

'latin1_bin', 'latin1_danish_ci', 'latin1_general_ci', 'latin1_general_cs',

'latin1_german1_ci', 'latin1_german2_ci', 'latin1_spanish_ci', 'latin1_swedish_ci',

'latin2_bin', 'latin2_croatian_ci', 'latin2_czech_cs', 'latin2_general_ci',

'latin2_hungarian_ci', 'latin5_bin', 'latin5_turkish_ci', 'latin7_bin',

'latin7_estonian_cs', 'latin7_general_ci', 'latin7_general_cs', 'macce_bin',

'macce_general_ci', 'macroman_bin', 'macroman_general_ci', 'sjis_bin',

'sjis_japanese_ci', 'swe7_bin', 'swe7_swedish_ci', 'tis620_bin',

'tis620_thai_ci', 'ucs2_bin', 'ucs2_czech_ci', 'ucs2_danish_ci',

'ucs2_estonian_ci', 'ucs2_general_ci', 'ucs2_hungarian_ci', 'ucs2_icelandic_ci',

'ucs2_latvian_ci', 'ucs2_lithuanian_ci', 'ucs2_persian_ci', 'ucs2_polish_ci',

'ucs2_roman_ci', 'ucs2_romanian_ci', 'ucs2_slovak_ci', 'ucs2_slovenian_ci',

'ucs2_spanish2_ci', 'ucs2_spanish_ci', 'ucs2_swedish_ci', 'ucs2_turkish_ci',

'ucs2_unicode_ci', 'ujis_bin', 'ujis_japanese_ci', 'utf8_bin',

'utf8_czech_ci', 'utf8_danish_ci', 'utf8_estonian_ci', 'utf8_general_ci',

'utf8_hungarian_ci', 'utf8_icelandic_ci', 'utf8_latvian_ci', 'utf8_lithuanian_ci',

'utf8_persian_ci', 'utf8_polish_ci', 'utf8_roman_ci', 'utf8_romanian_ci',

'utf8_slovak_ci', 'utf8_slovenian_ci', 'utf8_spanish2_ci', 'utf8_spanish_ci',

'utf8_swedish_ci', 'utf8_turkish_ci', 'utf8_unicode_ci'

)`)

{

   --skip Not all collations required for this test are present

}



################################

let $check_std_csets= 1;

let $check_ucs2_csets= 1;

let $check_utf8_csets= 1;



#

# Check all charsets/collation combinations

#



################################

let $check_std_csets= 1;

let $check_ucs2_csets= 1;

let $check_utf8_csets= 1;