Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6ef962a6
Commit
6ef962a6
authored
Jul 09, 2008
by
Joerg Bruehe
Browse files
Options
Browse Files
Download
Plain Diff
Merge from main 5.0 to 5.0-build.
parents
02577084
55ab1ef6
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
37 additions
and
7 deletions
+37
-7
configure.in
configure.in
+2
-2
mysql-test/suite/funcs_1/datadict/charset_collation.inc
mysql-test/suite/funcs_1/datadict/charset_collation.inc
+13
-1
mysql-test/suite/funcs_1/t/charset_collation_1.test
mysql-test/suite/funcs_1/t/charset_collation_1.test
+4
-2
mysql-test/suite/funcs_1/t/charset_collation_3.test
mysql-test/suite/funcs_1/t/charset_collation_3.test
+3
-2
support-files/my-huge.cnf.sh
support-files/my-huge.cnf.sh
+3
-0
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
+3
-0
support-files/my-large.cnf.sh
support-files/my-large.cnf.sh
+3
-0
support-files/my-medium.cnf.sh
support-files/my-medium.cnf.sh
+3
-0
support-files/my-small.cnf.sh
support-files/my-small.cnf.sh
+3
-0
No files found.
configure.in
View file @
6ef962a6
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
...
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
# remember to also change ndb version below and update version.c in ndb
AM_INIT_AUTOMAKE
(
mysql, 5.0.6
6
)
AM_INIT_AUTOMAKE
(
mysql, 5.0.6
8
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
AM_CONFIG_HEADER
([
include/config.h:config.h.in]
)
PROTOCOL_VERSION
=
10
PROTOCOL_VERSION
=
10
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
...
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
# ndb version
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MAJOR
=
5
NDB_VERSION_MINOR
=
0
NDB_VERSION_MINOR
=
0
NDB_VERSION_BUILD
=
6
6
NDB_VERSION_BUILD
=
6
8
NDB_VERSION_STATUS
=
""
NDB_VERSION_STATUS
=
""
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Set all version vars based on $VERSION. How do we do this more elegant ?
...
...
mysql-test/suite/funcs_1/datadict/charset_collation.inc
View file @
6ef962a6
...
@@ -8,7 +8,7 @@
...
@@ -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 @@
...
@@ -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
...
...
mysql-test/suite/funcs_1/t/charset_collation_1.test
View file @
6ef962a6
...
@@ -22,9 +22,11 @@ if (`SELECT EXISTS (SELECT 1 FROM information_schema.collations
...
@@ -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
mysql-test/suite/funcs_1/t/charset_collation_3.test
View file @
6ef962a6
...
@@ -16,9 +16,10 @@
...
@@ -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
support-files/my-huge.cnf.sh
View file @
6ef962a6
...
@@ -46,6 +46,9 @@ thread_concurrency = 8
...
@@ -46,6 +46,9 @@ thread_concurrency = 8
#
#
#skip-networking
#skip-networking
# Disable Federated by default
skip-federated
# Replication Master Server (default)
# Replication Master Server (default)
# binary logging is required for replication
# binary logging is required for replication
log-bin
=
mysql-bin
log-bin
=
mysql-bin
...
...
support-files/my-innodb-heavy-4G.cnf.sh
View file @
6ef962a6
...
@@ -357,6 +357,9 @@ myisam_repair_threads = 1
...
@@ -357,6 +357,9 @@ myisam_repair_threads = 1
myisam_recover
myisam_recover
# Disable Federated by default
skip-federated
# *** BDB Specific options ***
# *** BDB Specific options ***
# Use this option if you run a MySQL server with BDB support enabled but
# Use this option if you run a MySQL server with BDB support enabled but
...
...
support-files/my-large.cnf.sh
View file @
6ef962a6
...
@@ -46,6 +46,9 @@ thread_concurrency = 8
...
@@ -46,6 +46,9 @@ thread_concurrency = 8
#
#
#skip-networking
#skip-networking
# Disable Federated by default
skip-federated
# Replication Master Server (default)
# Replication Master Server (default)
# binary logging is required for replication
# binary logging is required for replication
log-bin
=
mysql-bin
log-bin
=
mysql-bin
...
...
support-files/my-medium.cnf.sh
View file @
6ef962a6
...
@@ -44,6 +44,9 @@ myisam_sort_buffer_size = 8M
...
@@ -44,6 +44,9 @@ myisam_sort_buffer_size = 8M
#
#
#skip-networking
#skip-networking
# Disable Federated by default
skip-federated
# Replication Master Server (default)
# Replication Master Server (default)
# binary logging is required for replication
# binary logging is required for replication
log-bin
=
mysql-bin
log-bin
=
mysql-bin
...
...
support-files/my-small.cnf.sh
View file @
6ef962a6
...
@@ -48,6 +48,9 @@ server-id = 1
...
@@ -48,6 +48,9 @@ server-id = 1
# Uncomment the following if you want to log updates
# Uncomment the following if you want to log updates
#log-bin=mysql-bin
#log-bin=mysql-bin
# Disable Federated by default
skip-federated
# Uncomment the following if you are NOT using BDB tables
# Uncomment the following if you are NOT using BDB tables
#skip-bdb
#skip-bdb
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment