mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge main 5.1 into 5.1-build
This commit is contained in:
commit
267917a4e6
3 changed files with 20 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue