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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
05443553
Commit
05443553
authored
Mar 28, 2007
by
kent@kent-amd64.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
parents
082de779
7a2e0ee7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
31 deletions
+21
-31
Makefile.am
Makefile.am
+10
-0
configure.in
configure.in
+9
-3
include/config-win.h
include/config-win.h
+0
-14
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+2
-14
No files found.
Makefile.am
View file @
05443553
...
...
@@ -147,6 +147,16 @@ test-force-full:
test-force-mem
:
$(MAKE)
force
=
--force
mem
=
--mem
test
test-bt
:
-
cd
mysql-test
;
MTR_BUILD_THREAD
=
auto
\
@PERL@ ./mysql-test-run.pl
--force
--comment
=
normal
--report-features
-
cd
mysql-test
;
MTR_BUILD_THREAD
=
auto
\
@PERL@ ./mysql-test-run.pl
--force
--comment
=
ps
--ps-protocol
test-bt-debug
:
-
cd
mysql-test
;
MTR_BUILD_THREAD
=
auto
\
@PERL@ ./mysql-test-run.pl
--force
--comment
=
debug
--report-features
# Keep these for a while
test-pl
:
test
test-full-pl
:
test-full
...
...
configure.in
View file @
05443553
...
...
@@ -2296,12 +2296,18 @@ AC_ARG_WITH(man,
[
with_man
=
yes
]
)
if
test
"
$with_man
"
=
"yes"
if
test
X
"
$with_man
"
=
Xyes
then
man_dirs
=
"man"
man1_files
=
`
ls
-1
$srcdir
/man/
*
.1 |
sed
-e
's;^.*man/;;'
`
if
test
X
"
$have_ndbcluster
"
=
Xyes
then
man1_files
=
`
ls
$srcdir
/man/
*
.1 |
sed
-e
's;^.*man/;;'
`
man8_files
=
`
ls
$srcdir
/man/
*
.8 |
sed
-e
's;^.*man/;;'
`
else
man1_files
=
`
ls
$srcdir
/man/
*
.1 |
grep
-v
'/ndb'
|
sed
-e
's;^.*man/;;'
`
man8_files
=
`
ls
$srcdir
/man/
*
.8 |
grep
-v
'/ndb'
|
sed
-e
's;^.*man/;;'
`
fi
man1_files
=
`
echo
$man1_files
`
man8_files
=
`
ls
-1
$srcdir
/man/
*
.8 |
sed
-e
's;^.*man/;;'
`
man8_files
=
`
echo
$man8_files
`
else
man_dirs
=
""
...
...
include/config-win.h
View file @
05443553
...
...
@@ -425,14 +425,8 @@ inline double ulonglong2double(ulonglong value)
#define shared_memory_buffer_length 16000
#define default_shared_memory_base_name "MYSQL"
#ifdef CYBOZU
#define MYSQL_DEFAULT_CHARSET_NAME "utf8"
#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"
#define HAVE_UTF8_GENERAL_CS 1
#else
#define MYSQL_DEFAULT_CHARSET_NAME "latin1"
#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
#endif
#define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1
...
...
@@ -443,10 +437,8 @@ inline double ulonglong2double(ulonglong value)
/* Define charsets you want */
/* #undef HAVE_CHARSET_armscii8 */
/* #undef HAVE_CHARSET_ascii */
#ifndef CYBOZU
#define HAVE_CHARSET_big5 1
#define HAVE_CHARSET_cp1250 1
#endif
/* #undef HAVE_CHARSET_cp1251 */
/* #undef HAVE_CHARSET_cp1256 */
/* #undef HAVE_CHARSET_cp1257 */
...
...
@@ -455,33 +447,27 @@ inline double ulonglong2double(ulonglong value)
/* #undef HAVE_CHARSET_cp866 */
#define HAVE_CHARSET_cp932 1
/* #undef HAVE_CHARSET_dec8 */
#ifndef CYBOZU
#define HAVE_CHARSET_eucjpms 1
#define HAVE_CHARSET_euckr 1
#define HAVE_CHARSET_gb2312 1
#define HAVE_CHARSET_gbk 1
#endif
/* #undef HAVE_CHARSET_greek */
/* #undef HAVE_CHARSET_hebrew */
/* #undef HAVE_CHARSET_hp8 */
/* #undef HAVE_CHARSET_keybcs2 */
/* #undef HAVE_CHARSET_koi8r */
/* #undef HAVE_CHARSET_koi8u */
#ifndef CYBOZU
#define HAVE_CHARSET_latin1 1
#define HAVE_CHARSET_latin2 1
#endif
/* #undef HAVE_CHARSET_latin5 */
/* #undef HAVE_CHARSET_latin7 */
/* #undef HAVE_CHARSET_macce */
/* #undef HAVE_CHARSET_macroman */
#define HAVE_CHARSET_sjis 1
/* #undef HAVE_CHARSET_swe7 */
#ifndef CYBOZU
#define HAVE_CHARSET_tis620 1
#define HAVE_CHARSET_ucs2 1
#define HAVE_CHARSET_ujis 1
#endif
#define HAVE_CHARSET_utf8 1
#define HAVE_UCA_COLLATIONS 1
support-files/mysql.spec.sh
View file @
05443553
...
...
@@ -337,11 +337,7 @@ then
cp
-fp
mysql-debug-%
{
mysql_version
}
/config.log
"
$MYSQL_DEBUGCONFLOG_DEST
"
fi
MTR_BUILD_THREAD
=
auto
export
MTR_BUILD_THREAD
(
cd
mysql-debug-%
{
mysql_version
}
/mysql-test
;
\
./mysql-test-run.pl
--comment
=
debug
--skip-rpl
--skip-ndbcluster
--force
--report-features
;
\
true
)
(
cd
mysql-debug-%
{
mysql_version
}
;
make test-bt-debug
)
##############################################################################
#
...
...
@@ -370,15 +366,7 @@ then
cp
-fp
mysql-release-%
{
mysql_version
}
/config.log
"
$MYSQL_CONFLOG_DEST
"
fi
MTR_BUILD_THREAD
=
auto
export
MTR_BUILD_THREAD
cd
mysql-release-%
{
mysql_version
}
/mysql-test
./mysql-test-run.pl
--comment
=
normal
--force
--skip-ndbcluster
--timer
--report-features
||
true
./mysql-test-run.pl
--comment
=
ps
--ps-protocol
--force
--skip-ndbcluster
--timer
||
true
./mysql-test-run.pl
--comment
=
normal+rowrepl
--mysqld
=
--binlog-format
=
row
--force
--skip-ndbcluster
--timer
||
true
./mysql-test-run.pl
--comment
=
ps+rowrepl+NDB
--ps-protocol
--mysqld
=
--binlog-format
=
row
--force
--timer
||
true
./mysql-test-run.pl
--comment
=
NDB
--with-ndbcluster-only
--force
--timer
||
true
cd
../..
(
cd
mysql-release-%
{
mysql_version
}
;
make test-bt
)
##############################################################################
...
...
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