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
8122b0ca
Commit
8122b0ca
authored
Mar 29, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
parents
a6f6c7d5
406fd12a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
34 deletions
+21
-34
CMakeLists.txt
CMakeLists.txt
+0
-3
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
-12
win/README
win/README
+0
-1
win/configure.js
win/configure.js
+0
-1
No files found.
CMakeLists.txt
View file @
8122b0ca
...
...
@@ -80,9 +80,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh
IF
(
__NT__
)
ADD_DEFINITIONS
(
-D __NT__
)
ENDIF
(
__NT__
)
IF
(
CYBOZU
)
ADD_DEFINITIONS
(
-D CYBOZU
)
ENDIF
(
CYBOZU
)
# in some places we use DBUG_OFF
SET
(
CMAKE_CXX_FLAGS_RELEASE
"
${
CMAKE_CXX_FLAGS_RELEASE
}
-D DBUG_OFF"
)
...
...
Makefile.am
View file @
8122b0ca
...
...
@@ -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 @
8122b0ca
...
...
@@ -2376,12 +2376,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 @
8122b0ca
...
...
@@ -408,14 +408,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
...
...
@@ -426,10 +420,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 */
...
...
@@ -438,33 +430,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 @
8122b0ca
...
...
@@ -354,12 +354,7 @@ then
cp
-fp
config.log
"
$MYSQL_MAXCONFLOG_DEST
"
fi
(
cd
mysql-test
MTR_BUILD_THREAD
=
auto
export
MTR_BUILD_THREAD
perl ./mysql-test-run.pl
--force
--report-features
perl ./mysql-test-run.pl
--force
--ps-protocol
true
)
make test-bt
# Save mysqld-max
./libtool
--mode
=
execute
cp
sql/mysqld sql/mysqld-max
...
...
@@ -418,12 +413,7 @@ then
cp
-fp
config.log
"
$MYSQL_CONFLOG_DEST
"
fi
(
cd
mysql-test
MTR_BUILD_THREAD
=
auto
export
MTR_BUILD_THREAD
perl ./mysql-test-run.pl
--force
--report-features
perl ./mysql-test-run.pl
--force
--ps-protocol
true
)
make test-bt
%install
RBR
=
$RPM_BUILD_ROOT
...
...
win/README
View file @
8122b0ca
...
...
@@ -48,7 +48,6 @@ The options right now are
MYSQL_SERVER_SUFFIX=<suffix> Server suffix, default none
COMPILATION_COMMENT=<comment> Server comment, default "Source distribution"
MYSQL_TCP_PORT=<port> Server port, default 3306
CYBOZU
DISABLE_GRANT_OPTIONS Disables the use of --init-file and --skip-grant-tables
options of mysqld.exe
...
...
win/configure.js
View file @
8122b0ca
...
...
@@ -46,7 +46,6 @@ try
case
"
WITH_INNOBASE_STORAGE_ENGINE
"
:
case
"
WITH_PARTITION_STORAGE_ENGINE
"
:
case
"
__NT__
"
:
case
"
CYBOZU
"
:
case
"
DISABLE_GRANT_OPTIONS
"
:
configfile
.
WriteLine
(
"
SET (
"
+
args
.
Item
(
i
)
+
"
TRUE)
"
);
break
;
...
...
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