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
7ddc8c35
Commit
7ddc8c35
authored
Aug 02, 2007
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into trift2.:/MySQL/M51/push-5.1
parents
c9e9d735
dc998d93
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
68 additions
and
103 deletions
+68
-103
client/mysqlbinlog.cc
client/mysqlbinlog.cc
+0
-8
dbug/CMakeLists.txt
dbug/CMakeLists.txt
+0
-1
libmysqld/CMakeLists.txt
libmysqld/CMakeLists.txt
+0
-4
libmysqld/Makefile.am
libmysqld/Makefile.am
+1
-1
libmysqld/examples/Makefile.am
libmysqld/examples/Makefile.am
+1
-0
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+0
-4
scripts/make_win_bin_dist
scripts/make_win_bin_dist
+54
-77
storage/myisam/myisamchk.c
storage/myisam/myisamchk.c
+2
-2
tests/CMakeLists.txt
tests/CMakeLists.txt
+5
-5
zlib/CMakeLists.txt
zlib/CMakeLists.txt
+5
-1
No files found.
client/mysqlbinlog.cc
View file @
7ddc8c35
...
...
@@ -1617,17 +1617,9 @@ int main(int argc, char** argv)
the server
*/
#if defined(__WIN__) && !defined(USING_CMAKE)
#include "my_decimal.h"
#include "decimal.c"
#include "my_decimal.cpp"
#include "log_event.cpp"
#include "log_event_old.cpp"
#else
#include "my_decimal.h"
#include "decimal.c"
#include "my_decimal.cc"
#include "log_event.cc"
#include "log_event_old.cc"
#endif
dbug/CMakeLists.txt
View file @
7ddc8c35
...
...
@@ -13,7 +13,6 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX -D__WIN32__"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
...
...
libmysqld/CMakeLists.txt
View file @
7ddc8c35
...
...
@@ -20,10 +20,6 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
# storage does not work properly in DLLs.
ADD_DEFINITIONS
(
-DUSE_TLS -DMYSQL_SERVER
)
# The old Windows build method used renamed (.cc -> .cpp) source files, fails
# in #include in lib_sql.cc. So disable that using the USING_CMAKE define.
ADD_DEFINITIONS
(
-DUSING_CMAKE
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
${
CMAKE_SOURCE_DIR
}
/libmysqld
${
CMAKE_SOURCE_DIR
}
/libmysql
...
...
libmysqld/Makefile.am
View file @
7ddc8c35
...
...
@@ -22,7 +22,7 @@ MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir
=
$(prefix)
MYSQLLIBdir
=
$(libdir)
EXTRA_DIST
=
libmysqld.def
EXTRA_DIST
=
libmysqld.def
CMakeLists.txt
DEFS
=
-DEMBEDDED_LIBRARY
-DMYSQL_SERVER
\
-DDEFAULT_MYSQL_HOME
=
"
\"
$(MYSQLBASEdir)
\"
"
\
-DDATADIR
=
"
\"
$(MYSQLDATAdir)
\"
"
\
...
...
libmysqld/examples/Makefile.am
View file @
7ddc8c35
...
...
@@ -19,6 +19,7 @@ client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
tests_sources
=
$(mysql_client_test_embedded_SOURCES)
BUILT_SOURCES
=
link_sources
CLEANFILES
=
$(client_sources)
$(tests_sources)
$(BUILT_SOURCES)
EXTRA_DIST
=
CMakeLists.txt
link_sources
:
for
f
in
$(client_sources)
;
do
\
...
...
libmysqld/lib_sql.cc
View file @
7ddc8c35
...
...
@@ -28,11 +28,7 @@ extern "C"
extern
unsigned
long
max_allowed_packet
,
net_buffer_length
;
}
#if defined(__WIN__) && !defined(USING_CMAKE)
#include "../sql/mysqld.cpp"
#else
#include "../sql/mysqld.cc"
#endif
C_MODE_START
...
...
scripts/make_win_bin_dist
View file @
7ddc8c35
...
...
@@ -127,6 +127,8 @@ if [ -e $DESTDIR ] ; then
usage
fi
trap
'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1'
ERR
# ----------------------------------------------------------------------
# Adjust target name if needed, release with debug info has another name
# ----------------------------------------------------------------------
...
...
@@ -137,19 +139,16 @@ then
fi
# ----------------------------------------------------------------------
# Copy executables, and client DLL
(FIXME why?)
# Copy executables, and client DLL
# ----------------------------------------------------------------------
trap
'echo "Clearning up and exiting..." ; rm -fr $DESTDIR; exit 1'
ERR
mkdir
$DESTDIR
mkdir
$DESTDIR
/bin
cp
client/
$TARGET
/
*
.exe
$DESTDIR
/bin/
cp
extra/
$TARGET
/
*
.exe
$DESTDIR
/bin/
cp
storage/myisam/
$TARGET
/
*
.exe
$DESTDIR
/bin/
cp
server-tools/instance-manager/
$TARGET
/
*
.
{
exe,map
}
$DESTDIR
/bin/
if
[
x
"
$TARGET
"
!=
x
"release"
]
then
if
[
x
"
$TARGET
"
!=
x
"release"
]
;
then
cp
server-tools/instance-manager/
$TARGET
/
*
.pdb
$DESTDIR
/bin/
fi
cp
tests/
$TARGET
/
*
.exe
$DESTDIR
/bin/
...
...
@@ -161,8 +160,7 @@ mv $DESTDIR/bin/comp_err.exe $DESTDIR/bin/comp-err.exe
cp
sql/
$TARGET
/mysqld.exe
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.exe
cp
sql/
$TARGET
/mysqld.map
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.map
if
[
x
"
$TARGET
"
!=
x
"release"
]
then
if
[
x
"
$TARGET
"
!=
x
"release"
]
;
then
cp
sql/
$TARGET
/mysqld.pdb
$DESTDIR
/bin/mysqld
$EXE_SUFFIX
.pdb
fi
...
...
@@ -177,9 +175,8 @@ fi
# Copy data directory, readme files etc
# ----------------------------------------------------------------------
# FIXME is there ever a data directory to copy?
if
[
-d
win/data
]
;
then
cp
-pR
win/data
$DESTDIR
/
data
cp
-pR
win/data
$DESTDIR
/
fi
# FIXME maybe a flag to define "release build", or do the
...
...
@@ -230,45 +227,47 @@ if [ x"$PACK_EMBEDDED" = x"" -a \
fi
# ----------------------------------------------------------------------
# FIXME test stuff that is useless garbage?
# ----------------------------------------------------------------------
mkdir
-p
$DESTDIR
/examples/libmysqltest/release
cp
libmysql/mytest.c libmysql/myTest.vcproj libmysql/
$TARGET
/myTest.exe
\
$DESTDIR
/examples/libmysqltest/
cp
libmysql/
$TARGET
/myTest.exe
$DESTDIR
/examples/libmysqltest/release/
if
[
x
"
$PACK_DEBUG
"
=
x
""
-a
-f
"libmysql/debug/myTest.exe"
-o
\
x
"
$PACK_DEBUG
"
=
x
"yes"
]
;
then
mkdir
-p
$DESTDIR
/examples/libmysqltest/debug
cp
libmysql/debug/myTest.exe
$DESTDIR
/examples/libmysqltest/debug/
fi
mkdir
-p
$DESTDIR
/examples/tests
cp
tests/
*
.res tests/
*
.tst tests/
*
.pl tests/
*
.c
$DESTDIR
/examples/tests/
mkdir
-p
$DESTDIR
/examples/udf_example
cp
sql/udf_example.def sql/udf_example.vcproj sql/udf_example.c
$DESTDIR
/examples/udf_example/
# ----------------------------------------------------------------------
# FIXME why not copy it all in "include"?!
# Note: Make sure to sync with include/Makefile.am and WiX installer
# XML specifications
# ----------------------------------------------------------------------
mkdir
-p
$DESTDIR
/include
cp
include/conf
*
.h
\
include/mysql
*
.h
\
include/errmsg.h
\
include/my_alloc.h
\
include/my_getopt.h
\
include/my_sys.h
\
cp
include/mysql.h
\
include/mysql_com.h
\
include/mysql_time.h
\
include/my_list.h
\
include/my_pthread.h
\
include/my_alloc.h
\
include/typelib.h
\
include/my_dbug.h
\
include/m_string.h
\
include/m_ctype.h
\
include/my_sys.h
\
include/my_xml.h
\
include/mysql_embed.h
\
include/my_pthread.h
\
include/my_no_pthread.h
\
include/decimal.h
\
include/errmsg.h
\
include/my_global.h
\
include/typelib.h
$DESTDIR
/include/
cp
libmysql/libmysql.def
$DESTDIR
/include/
include/my_net.h
\
include/my_getopt.h
\
include/sslopt-longopts.h
\
include/my_dir.h
\
include/sslopt-vars.h
\
include/sslopt-case.h
\
include/sql_common.h
\
include/keycache.h
\
include/m_ctype.h
\
include/my_attribute.h
\
include/mysqld_error.h
\
include/sql_state.h
\
include/mysqld_ername.h
\
include/mysql_version.h
\
include/config-win.h
\
libmysql/libmysql.def
\
$DESTDIR
/include/
mkdir
-p
$DESTDIR
/include/mysql
cp
include/mysql/plugin.h
$DESTDIR
/include/mysql/
# ----------------------------------------------------------------------
# Client libraries, and other libraries
...
...
@@ -278,7 +277,8 @@ cp libmysql/libmysql.def $DESTDIR/include/
mkdir
-p
$DESTDIR
/lib/opt
cp
libmysql/
$TARGET
/libmysql.dll
\
libmysql/
$TARGET
/libmysql.lib
\
client/
$TARGET
/mysqlclient.lib
\
libmysql/
$TARGET
/mysqlclient.lib
\
mysys/
$TARGET
/mysys.lib
\
regex/
$TARGET
/regex.lib
\
strings/
$TARGET
/strings.lib
\
zlib/
$TARGET
/zlib.lib
$DESTDIR
/lib/opt/
...
...
@@ -288,59 +288,28 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
mkdir
-p
$DESTDIR
/lib/debug
cp
libmysql/debug/libmysql.dll
\
libmysql/debug/libmysql.lib
\
client
/debug/mysqlclient.lib
\
libmysql
/debug/mysqlclient.lib
\
mysys/debug/mysys.lib
\
regex/debug/regex.lib
\
strings/debug/strings.lib
\
zlib/debug/zlib.lib
$DESTDIR
/lib/debug/
fi
# FIXME sort this out...
cp
mysys/
$TARGET
/mysys.lib
$DESTDIR
/lib/opt/mysys_tls.lib
# ----------------------------------------------------------------------
# Copy the test directory
# ----------------------------------------------------------------------
mkdir
-p
$DESTDIR
/mysql-test/include
$DESTDIR
/mysql-test/lib
\
$DESTDIR
/mysql-test/r
$DESTDIR
/mysql-test/std_data
\
$DESTDIR
/mysql-test/t
$DESTDIR
/mysql-test/suite
mkdir
$DESTDIR
/mysql-test
cp
mysql-test/mysql-test-run.pl
$DESTDIR
/mysql-test/
cp
mysql-test/README
$DESTDIR
/mysql-test/
cp
mysql-test/install_test_db.sh
$DESTDIR
/mysql-test/install_test_db
cp
mysql-test/include/
*
.inc
$DESTDIR
/mysql-test/include/
cp
mysql-test/lib/
*
.pl
$DESTDIR
/mysql-test/lib/
cp
mysql-test/r/
*
.require
$DESTDIR
/mysql-test/r/
# Need this trick, or we get "argument list too long".
ABS_DST
=
`
pwd
`
/
$DESTDIR
(
cd
mysql-test/r/
&&
cp
*
.result
$ABS_DST
/mysql-test/r/
)
cp
mysql-test/std_data/Moscow_leap
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/des_key_file
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/
*
.000001
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/
*
.cnf
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/
*
.dat
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/
*
.frm
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/
*
.pem
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/std_data/
*
.MY
*
$DESTDIR
/mysql-test/std_data/
cp
mysql-test/t/
*
.opt
$DESTDIR
/mysql-test/t/
cp
mysql-test/t/
*
.sh
$DESTDIR
/mysql-test/t/
cp
mysql-test/t/
*
.slave-mi
$DESTDIR
/mysql-test/t/
||
/bin/true
cp
mysql-test/t/
*
.sql
$DESTDIR
/mysql-test/t/
cp
mysql-test/t/
*
.def
$DESTDIR
/mysql-test/t/
(
cd
mysql-test/t/
&&
cp
*
.test
$ABS_DST
/mysql-test/t/
)
cp
-R
mysql-test/
{
t,r,include,suite,std_data,lib
}
$DESTDIR
/mysql-test/
# Note that this will not copy "extra" if a soft link
if
[
-d
mysql-test/extra
]
;
then
mkdir
-p
$DESTDIR
/mysql-test/extra
mkdir
$DESTDIR
/mysql-test/extra
cp
-pR
mysql-test/extra/
*
$DESTDIR
/mysql-test/extra/
fi
# Copy all directories in mysql-test/suite/
for
i
in
`
cd
mysql-test/suite
&&
ls
`
;
do
\
mkdir
-p
$DESTDIR
/mysql-test/suite/
$i
;
\
cp
-R
mysql-test/suite/
$i
$DESTDIR
/mysql-test/suite/
;
\
done
# ----------------------------------------------------------------------
# Copy what could be usable in the "scripts" directory. Currently
# only SQL files, others are Bourne shell scripts or Perl scripts
...
...
@@ -366,10 +335,18 @@ for i in `cd scripts && ls`; do \
done
cp
-pR
sql/share
$DESTDIR
/
cp
-pR
sql-bench
$DESTDIR
/
rm
-f
$DESTDIR
/sql-bench/
*
.sh
$DESTDIR
/sql-bench/Makefile
*
# The SQL initialisation code is really expected to be in "share"
mv
$DESTDIR
/scripts/
*
.sql
$DESTDIR
/share/
||
true
# ----------------------------------------------------------------------
# Clean up from possibly copied SCCS directories
# ----------------------------------------------------------------------
rm
-rf
`
find
$DISTDIR
-type
d
-name
SCCS
-print
`
# ----------------------------------------------------------------------
# Copy other files specified on command line DEST=SOURCE
# ----------------------------------------------------------------------
...
...
storage/myisam/myisamchk.c
View file @
7ddc8c35
...
...
@@ -329,7 +329,7 @@ static struct my_option my_long_options[] =
(
uchar
**
)
&
ft_stopword_file
,
(
uchar
**
)
&
ft_stopword_file
,
0
,
GET_STR
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
{
"stats_method"
,
OPT_STATS_METHOD
,
"Specifies how index statistics collection code should t
h
reat NULLs. "
"Specifies how index statistics collection code should treat NULLs. "
"Possible values of name are
\"
nulls_unequal
\"
(default behavior for 4.1/5.0), "
"
\"
nulls_equal
\"
(emulate 4.0 behavior), and
\"
nulls_ignored
\"
."
,
(
uchar
**
)
&
myisam_stats_method_str
,
(
uchar
**
)
&
myisam_stats_method_str
,
0
,
...
...
@@ -444,7 +444,7 @@ static void usage(void)
MySQL faster. You can check the calculated distribution
\n
\
by using '--description --verbose table_name'.
\n
\
--stats_method=name Specifies how index statistics collection code should
\n
\
t
h
reat NULLs. Possible values of name are
\"
nulls_unequal
\"\n
\
treat NULLs. Possible values of name are
\"
nulls_unequal
\"\n
\
(default for 4.1/5.0),
\"
nulls_equal
\"
(emulate 4.0), and
\n
\
\"
nulls_ignored
\"
.
\n
\
-d, --description Prints some information about table.
\n
\
...
...
tests/CMakeLists.txt
View file @
7ddc8c35
...
...
@@ -13,15 +13,15 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
# About "mysqlclient_notls", see note in "client/CMakeLists.txt"
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-DSAFEMALLOC -DSAFE_MUTEX"
)
ADD_DEFINITIONS
(
"-DMYSQL_CLIENT"
)
INCLUDE_DIRECTORIES
(
${
CMAKE_SOURCE_DIR
}
/include
)
ADD_EXECUTABLE
(
mysql_client_test mysql_client_test.c
)
TARGET_LINK_LIBRARIES
(
mysql_client_test
dbug mysys mysqlclient yassl taocrypt zlib
wsock32
)
ADD_EXECUTABLE
(
mysql_client_test mysql_client_test.c
../mysys/my_memmem.c
)
TARGET_LINK_LIBRARIES
(
mysql_client_test
mysqlclient_notls
wsock32
)
ADD_EXECUTABLE
(
bug25714 bug25714.c
)
TARGET_LINK_LIBRARIES
(
bug25714
dbug mysys mysqlclient yassl taocrypt zlib
wsock32
)
TARGET_LINK_LIBRARIES
(
bug25714
mysqlclient_notls
wsock32
)
zlib/CMakeLists.txt
View file @
7ddc8c35
...
...
@@ -13,10 +13,14 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# Note that this library is not using any "Thread Local Storage" (TLS),
# i.e. no data declared "__declspec(thread)" or allocated with TlsAlloc().
# Not directly and indirectly using any of the macros for creating and
# using the storage, pthread_key*(), {,my_}{set,get}_specific*() ....
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS_DEBUG
}
-D_DEBUG"
)
SET
(
CMAKE_C_FLAGS_DEBUG
"
${
CMAKE_C_FLAGS_DEBUG
}
-D_DEBUG"
)
ADD_DEFINITIONS
(
-DUSE_TLS -DMYSQL_CLIENT -D__WIN32__
)
ADD_LIBRARY
(
zlib adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h
inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h zlib.h
zutil.c zutil.h
)
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