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
004691e0
Commit
004691e0
authored
Oct 22, 2007
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
parents
d9274610
f3eed850
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
41 additions
and
27 deletions
+41
-27
CMakeLists.txt
CMakeLists.txt
+9
-8
configure.in
configure.in
+6
-1
mysql-test/suite/funcs_2/r/innodb_charset.result
mysql-test/suite/funcs_2/r/innodb_charset.result
+3
-3
mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/r/memory_charset.result
+3
-3
mysql-test/suite/funcs_2/r/myisam_charset.result
mysql-test/suite/funcs_2/r/myisam_charset.result
+3
-3
mysql-test/suite/funcs_2/r/ndb_charset.result
mysql-test/suite/funcs_2/r/ndb_charset.result
+3
-3
scripts/Makefile.am
scripts/Makefile.am
+10
-4
scripts/mysqlbug.sh
scripts/mysqlbug.sh
+4
-2
No files found.
CMakeLists.txt
View file @
004691e0
...
@@ -109,6 +109,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
...
@@ -109,6 +109,15 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_INIT
${
CMAKE_CXX_FLAGS_INIT
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_INIT
${
CMAKE_CXX_FLAGS_INIT
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
STRING
(
REPLACE
"/EHsc"
""
CMAKE_CXX_FLAGS_DEBUG_INIT
${
CMAKE_CXX_FLAGS_DEBUG_INIT
}
)
# Disable automatic manifest generation.
STRING
(
REPLACE
"/MANIFEST"
"/MANIFEST:NO"
CMAKE_EXE_LINKER_FLAGS
${
CMAKE_EXE_LINKER_FLAGS
}
)
# Explicitly disable it since it is the default for newer versions of VS
STRING
(
REGEX MATCH
"MANIFEST:NO"
tmp_manifest
${
CMAKE_EXE_LINKER_FLAGS
}
)
IF
(
NOT tmp_manifest
)
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/MANIFEST:NO"
)
ENDIF
(
NOT tmp_manifest
)
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR
ENDIF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 7"
OR
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
CMAKE_GENERATOR MATCHES
"Visual Studio 8"
)
...
@@ -156,14 +165,6 @@ IF(EMBED_MANIFESTS)
...
@@ -156,14 +165,6 @@ IF(EMBED_MANIFESTS)
MESSAGE
(
FATAL_ERROR
"Sign tool, signtool.exe, can't be found."
)
MESSAGE
(
FATAL_ERROR
"Sign tool, signtool.exe, can't be found."
)
ENDIF
(
HAVE_SIGN_TOOL
)
ENDIF
(
HAVE_SIGN_TOOL
)
# Disable automatic manifest generation.
STRING
(
REPLACE
"/MANIFEST"
"/MANIFEST:NO"
CMAKE_EXE_LINKER_FLAGS
${
CMAKE_EXE_LINKER_FLAGS
}
)
# Explicitly disable it since it is the default for newer versions of VS
STRING
(
REGEX MATCH
"MANIFEST:NO"
tmp_manifest
${
CMAKE_EXE_LINKER_FLAGS
}
)
IF
(
NOT tmp_manifest
)
SET
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/MANIFEST:NO"
)
ENDIF
(
NOT tmp_manifest
)
# Set the processor architecture.
# Set the processor architecture.
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
IF
(
CMAKE_GENERATOR MATCHES
"Visual Studio 8 2005 Win64"
)
SET
(
PROCESSOR_ARCH
"amd64"
)
SET
(
PROCESSOR_ARCH
"amd64"
)
...
...
configure.in
View file @
004691e0
...
@@ -124,6 +124,8 @@ case $MACHINE_TYPE in
...
@@ -124,6 +124,8 @@ case $MACHINE_TYPE in
esac
esac
# Save some variables and the command line options for mysqlbug
# Save some variables and the command line options for mysqlbug
SAVE_CC
=
"
$CC
"
SAVE_CXX
=
"
$CXX
"
SAVE_ASFLAGS
=
"
$ASFLAGS
"
SAVE_ASFLAGS
=
"
$ASFLAGS
"
SAVE_CFLAGS
=
"
$CFLAGS
"
SAVE_CFLAGS
=
"
$CFLAGS
"
SAVE_CXXFLAGS
=
"
$CXXFLAGS
"
SAVE_CXXFLAGS
=
"
$CXXFLAGS
"
...
@@ -131,6 +133,8 @@ SAVE_LDFLAGS="$LDFLAGS"
...
@@ -131,6 +133,8 @@ SAVE_LDFLAGS="$LDFLAGS"
SAVE_CXXLDFLAGS
=
"
$CXXLDFLAGS
"
SAVE_CXXLDFLAGS
=
"
$CXXLDFLAGS
"
CONF_COMMAND
=
"
$0
$ac_configure_args
"
CONF_COMMAND
=
"
$0
$ac_configure_args
"
AC_SUBST
(
CONF_COMMAND
)
AC_SUBST
(
CONF_COMMAND
)
AC_SUBST
(
SAVE_CC
)
AC_SUBST
(
SAVE_CXX
)
AC_SUBST
(
SAVE_ASFLAGS
)
AC_SUBST
(
SAVE_ASFLAGS
)
AC_SUBST
(
SAVE_CFLAGS
)
AC_SUBST
(
SAVE_CFLAGS
)
AC_SUBST
(
SAVE_CXXFLAGS
)
AC_SUBST
(
SAVE_CXXFLAGS
)
...
@@ -373,6 +377,7 @@ AC_SUBST(CC)
...
@@ -373,6 +377,7 @@ AC_SUBST(CC)
AC_SUBST
(
CFLAGS
)
AC_SUBST
(
CFLAGS
)
AC_SUBST
(
CXX
)
AC_SUBST
(
CXX
)
AC_SUBST
(
CXXFLAGS
)
AC_SUBST
(
CXXFLAGS
)
AC_SUBST
(
ASFLAGS
)
AC_SUBST
(
LD
)
AC_SUBST
(
LD
)
AC_SUBST
(
INSTALL_SCRIPT
)
AC_SUBST
(
INSTALL_SCRIPT
)
...
@@ -631,7 +636,7 @@ AC_SUBST(NOINST_LDFLAGS)
...
@@ -631,7 +636,7 @@ AC_SUBST(NOINST_LDFLAGS)
if
test
"
$TARGET_LINUX
"
=
"true"
-a
"
$static_nss
"
=
""
if
test
"
$TARGET_LINUX
"
=
"true"
-a
"
$static_nss
"
=
""
then
then
tmp
=
`
nm /usr/lib/libc.a |
grep
_nss_files_getaliasent_r
`
tmp
=
`
nm /usr/lib
*
/libc.a |
grep
_nss_files_getaliasent_r
`
if
test
-n
"
$tmp
"
if
test
-n
"
$tmp
"
then
then
STATIC_NSS_FLAGS
=
"-lc -lnss_files -lnss_dns -lresolv"
STATIC_NSS_FLAGS
=
"-lc -lnss_files -lnss_dns -lresolv"
...
...
mysql-test/suite/funcs_2/r/innodb_charset.result
View file @
004691e0
...
@@ -737,7 +737,6 @@ a_ascii a_len
...
@@ -737,7 +737,6 @@ a_ascii a_len
44 1
44 1
64 1
64 1
45 1
45 1
60 1
65 1
65 1
46 1
46 1
66 1
66 1
...
@@ -779,17 +778,18 @@ a_ascii a_len
...
@@ -779,17 +778,18 @@ a_ascii a_len
78 1
78 1
59 1
59 1
79 1
79 1
7E 1
5A 1
5A 1
7A 1
7A 1
5D 1
5B 1
5B 1
5C 1
5C 1
5D 1
5E 1
5E 1
5F 1
5F 1
60 1
7B 1
7B 1
7C 1
7C 1
7D 1
7D 1
7E 1
7F 1
7F 1
80 1
80 1
81 1
81 1
...
...
mysql-test/suite/funcs_2/r/memory_charset.result
View file @
004691e0
...
@@ -737,7 +737,6 @@ a_ascii a_len
...
@@ -737,7 +737,6 @@ a_ascii a_len
44 1
44 1
64 1
64 1
45 1
45 1
60 1
65 1
65 1
46 1
46 1
66 1
66 1
...
@@ -779,17 +778,18 @@ a_ascii a_len
...
@@ -779,17 +778,18 @@ a_ascii a_len
78 1
78 1
59 1
59 1
79 1
79 1
7E 1
5A 1
5A 1
7A 1
7A 1
5D 1
5B 1
5B 1
5C 1
5C 1
5D 1
5E 1
5E 1
5F 1
5F 1
60 1
7B 1
7B 1
7C 1
7C 1
7D 1
7D 1
7E 1
7F 1
7F 1
80 1
80 1
81 1
81 1
...
...
mysql-test/suite/funcs_2/r/myisam_charset.result
View file @
004691e0
...
@@ -737,7 +737,6 @@ a_ascii a_len
...
@@ -737,7 +737,6 @@ a_ascii a_len
44 1
44 1
64 1
64 1
45 1
45 1
60 1
65 1
65 1
46 1
46 1
66 1
66 1
...
@@ -779,17 +778,18 @@ a_ascii a_len
...
@@ -779,17 +778,18 @@ a_ascii a_len
78 1
78 1
59 1
59 1
79 1
79 1
7E 1
5A 1
5A 1
7A 1
7A 1
5D 1
5B 1
5B 1
5C 1
5C 1
5D 1
5E 1
5E 1
5F 1
5F 1
60 1
7B 1
7B 1
7C 1
7C 1
7D 1
7D 1
7E 1
7F 1
7F 1
80 1
80 1
81 1
81 1
...
...
mysql-test/suite/funcs_2/r/ndb_charset.result
View file @
004691e0
...
@@ -737,7 +737,6 @@ a_ascii a_len
...
@@ -737,7 +737,6 @@ a_ascii a_len
44 1
44 1
64 1
64 1
45 1
45 1
60 1
65 1
65 1
46 1
46 1
66 1
66 1
...
@@ -779,17 +778,18 @@ a_ascii a_len
...
@@ -779,17 +778,18 @@ a_ascii a_len
78 1
78 1
59 1
59 1
79 1
79 1
7E 1
5A 1
5A 1
7A 1
7A 1
5D 1
5B 1
5B 1
5C 1
5C 1
5D 1
5E 1
5E 1
5F 1
5F 1
60 1
7B 1
7B 1
7C 1
7C 1
7D 1
7D 1
7E 1
7F 1
7F 1
80 1
80 1
81 1
81 1
...
...
scripts/Makefile.am
View file @
004691e0
...
@@ -149,13 +149,19 @@ SUFFIXES = .sh
...
@@ -149,13 +149,19 @@ SUFFIXES = .sh
-e
's!@''CC''@!@CC@!'
\
-e
's!@''CC''@!@CC@!'
\
-e
's!@''CXX''@!@CXX@!'
\
-e
's!@''CXX''@!@CXX@!'
\
-e
's!@''GXX''@!@GXX@!'
\
-e
's!@''GXX''@!@GXX@!'
\
-e
's!@''SAVE_CC''@!@SAVE_CC@!'
\
-e
's!@''SAVE_CXX''@!@SAVE_CXX@!'
\
-e
's!@''CC_VERSION''@!@CC_VERSION@!'
\
-e
's!@''CC_VERSION''@!@CC_VERSION@!'
\
-e
's!@''CXX_VERSION''@!@CXX_VERSION@!'
\
-e
's!@''CXX_VERSION''@!@CXX_VERSION@!'
\
-e
's!@''PERL''@!@PERL@!'
\
-e
's!@''PERL''@!@PERL@!'
\
-e
's!@''ASFLAGS''@!@SAVE_ASFLAGS@!'
\
-e
's!@''SAVE_ASFLAGS''@!@SAVE_ASFLAGS@!'
\
-e
's!@''CFLAGS''@!@SAVE_CFLAGS@!'
\
-e
's!@''SAVE_CFLAGS''@!@SAVE_CFLAGS@!'
\
-e
's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'
\
-e
's!@''SAVE_CXXFLAGS''@!@SAVE_CXXFLAGS@!'
\
-e
's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'
\
-e
's!@''SAVE_LDFLAGS''@!@SAVE_LDFLAGS@!'
\
-e
's!@''ASFLAGS''@!@ASFLAGS@!'
\
-e
's!@''CFLAGS''@!@CFLAGS@!'
\
-e
's!@''CXXFLAGS''@!@CXXFLAGS@!'
\
-e
's!@''LDFLAGS''@!@LDFLAGS@!'
\
-e
's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!'
\
-e
's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!'
\
-e
's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!'
\
-e
's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!'
\
-e
's!@''LIBS''@!@LIBS@!'
\
-e
's!@''LIBS''@!@LIBS@!'
\
...
...
scripts/mysqlbug.sh
View file @
004691e0
...
@@ -23,7 +23,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
...
@@ -23,7 +23,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@"
COMPILATION_COMMENT
=
"@COMPILATION_COMMENT@"
COMPILATION_COMMENT
=
"@COMPILATION_COMMENT@"
BUGmysql
=
"mysql@lists.mysql.com"
BUGmysql
=
"mysql@lists.mysql.com"
# This is set by configure
# This is set by configure
COMP_ENV_INFO
=
"CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"
COMP_CALL_INFO
=
"CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'"
COMP_RUN_INFO
=
"CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'"
CONFIGURE_LINE
=
"@CONF_COMMAND@"
CONFIGURE_LINE
=
"@CONF_COMMAND@"
LIBC_INFO
=
""
LIBC_INFO
=
""
...
@@ -261,7 +262,8 @@ ${ORGANIZATION- $ORGANIZATION_C}
...
@@ -261,7 +262,8 @@ ${ORGANIZATION- $ORGANIZATION_C}
`test -n "
$MACHINE
" && echo "Machine:
$MACHINE
"`
`test -n "
$MACHINE
" && echo "Machine:
$MACHINE
"`
`test -n "
$FILE_PATHS
" && echo "Some paths:
$FILE_PATHS
"`
`test -n "
$FILE_PATHS
" && echo "Some paths:
$FILE_PATHS
"`
`test -n "
$GCC_INFO
" && echo "GCC:
$GCC_INFO
"`
`test -n "
$GCC_INFO
" && echo "GCC:
$GCC_INFO
"`
`test -n "
$COMP_ENV_INFO
" && echo "Compilation info:
$COMP_ENV_INFO
"`
`test -n "
$COMP_CALL_INFO
" && echo "Compilation info (call):
$COMP_CALL_INFO
"`
`test -n "
$COMP_RUN_INFO
" && echo "Compilation info (used):
$COMP_RUN_INFO
"`
`test -n "
$LIBC_INFO
" && echo "LIBC:
$LIBC_INFO
"`
`test -n "
$LIBC_INFO
" && echo "LIBC:
$LIBC_INFO
"`
`test -n "
$CONFIGURE_LINE
" && echo "Configure command:
$CONFIGURE_LINE
"`
`test -n "
$CONFIGURE_LINE
" && echo "Configure command:
$CONFIGURE_LINE
"`
`test -n "
$PERL_INFO
" && echo "Perl:
$PERL_INFO
"`
`test -n "
$PERL_INFO
" && echo "Perl:
$PERL_INFO
"`
...
...
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