database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge 5.1-main --> 5.1-bugteam

Browse Source
This commit is contained in:
Gleb Shchepa
2008-07-10 03:01:41 +05:00
parent 1d9fab7f4d 2ed83dd95f
commit 2334691f87
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
# #
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version(). # in mysqlbinlog::check_master_version().
AM_INIT_AUTOMAKE(mysql, 5.1.27) AM_INIT_AUTOMAKE(mysql, 5.1.28)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

14
mysql-test/suite/funcs_1/datadict/charset_collation.inc
View File

@ -8,7 +8,7 @@
# #
# The amount and properties of character_sets/collations depend on the # The amount and properties of character_sets/collations depend on the
# build type # build type
# 2007-12 MySQL 5.0 # 2007-12 MySQL 5.0, 2008-06 MySQL 5.1
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# #
# Variant 1 fits to # Variant 1 fits to
@ -33,10 +33,22 @@
# Variant 3 fits to # Variant 3 fits to
# version_comment MySQL Community Server (GPL) # version_comment MySQL Community Server (GPL)
# version_comment MySQL Cluster Server (Commercial) # 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 # Difference between variant 3 and 2 is within the collation properties
# IS_COMPILED and SORTLEN. # 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: # Created:
# 2007-12-18 mleich - remove the unstable character_set/collation subtests # 2007-12-18 mleich - remove the unstable character_set/collation subtests
# from include/datadict-master.inc # from include/datadict-master.inc

6
mysql-test/suite/funcs_1/t/charset_collation_1.test
View File

@ -22,9 +22,11 @@ if (`SELECT EXISTS (SELECT 1 FROM information_schema.collations
OR ( @@version_comment NOT LIKE '%Source%' OR ( @@version_comment NOT LIKE '%Source%'
AND @@version_comment NOT LIKE '%Enterprise%' AND @@version_comment NOT LIKE '%Enterprise%'
AND @@version_comment NOT LIKE '%Classic%' 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 --source suite/funcs_1/datadict/charset_collation.inc

5
mysql-test/suite/funcs_1/t/charset_collation_3.test
View File

@ -16,9 +16,10 @@
# #
if (`SELECT @@version_comment NOT LIKE '%Community%' 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 --source suite/funcs_1/datadict/charset_collation.inc