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
b492d05e
Commit
b492d05e
authored
Apr 04, 2006
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
d99d4d9b
0298bfaa
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
37 additions
and
31 deletions
+37
-31
Docs/MySQLEULA.txt
Docs/MySQLEULA.txt
+1
-1
README
README
+1
-1
VC++Files/libmysqld/libmysqld.vcproj
VC++Files/libmysqld/libmysqld.vcproj
+0
-1
VC++Files/mysqldemb/mysqldemb.vcproj
VC++Files/mysqldemb/mysqldemb.vcproj
+0
-1
VC++Files/mysys/mysys.vcproj
VC++Files/mysys/mysys.vcproj
+0
-1
VC++Files/sql/mysqld.vcproj
VC++Files/sql/mysqld.vcproj
+0
-7
VC++Files/storage/bdb/bdb.vcproj
VC++Files/storage/bdb/bdb.vcproj
+0
-1
VC++Files/storage/innobase/innobase.vcproj
VC++Files/storage/innobase/innobase.vcproj
+0
-2
config/ac-macros/openssl.m4
config/ac-macros/openssl.m4
+4
-2
config/ac-macros/yassl.m4
config/ac-macros/yassl.m4
+0
-2
config/ac-macros/zlib.m4
config/ac-macros/zlib.m4
+5
-4
libmysql/Makefile.am
libmysql/Makefile.am
+5
-1
libmysql_r/Makefile.am
libmysql_r/Makefile.am
+5
-1
mysql-test/Makefile.am
mysql-test/Makefile.am
+5
-3
netware/mysql_install_db.c
netware/mysql_install_db.c
+1
-1
scripts/mysql_install_db.sh
scripts/mysql_install_db.sh
+2
-1
sql/item.cc
sql/item.cc
+2
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+6
-0
No files found.
Docs/MySQLEULA.txt
View file @
b492d05e
...
...
@@ -63,7 +63,7 @@ Licensee.
4. Price and payment.
No later than thirty (30) days after submission of the Order Form, Licensee
shall remit one non-refundable license fee per Licensed Copy as posted on
http://
order
.mysql.com on the date Licensee submitted the Order Form (the
http://
shop
.mysql.com on the date Licensee submitted the Order Form (the
"License Fee"). All payments shall be made in Euros or U.S. dollars. Licensee
shall be responsible for paying all local, state, federal and international
sales, value added, excise and other taxes and duties payable in connection
...
...
README
View file @
b492d05e
...
...
@@ -8,7 +8,7 @@ License information can be found in these files:
For further information about MySQL or additional documentation, see:
- The latest information about MySQL: http://www.mysql.com
- The current MySQL documentation: http:/dev.mysql.com/doc
- The current MySQL documentation: http:/
/
dev.mysql.com/doc
Some manual sections of special interest:
...
...
VC++Files/libmysqld/libmysqld.vcproj
View file @
b492d05e
...
...
@@ -86,7 +86,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-pro"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
VC++Files/mysqldemb/mysqldemb.vcproj
View file @
b492d05e
...
...
@@ -71,7 +71,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-pro"
Optimization=
"2"
InlineFunctionExpansion=
"1"
AdditionalIncludeDirectories=
"../include,../regex,../libmysqld,../sql,../zlib"
...
...
VC++Files/mysys/mysys.vcproj
View file @
b492d05e
...
...
@@ -67,7 +67,6 @@
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-max"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
VC++Files/sql/mysqld.vcproj
View file @
b492d05e
...
...
@@ -20,7 +20,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-classic-nt"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -82,7 +81,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-max"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -143,7 +141,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-nt-max"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -207,7 +204,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-nt"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -271,7 +267,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-pro-nt"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -393,7 +388,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-pro"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -455,7 +449,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-classic"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
VC++Files/storage/bdb/bdb.vcproj
View file @
b492d05e
...
...
@@ -20,7 +20,6 @@
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-max"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
VC++Files/storage/innobase/innobase.vcproj
View file @
b492d05e
...
...
@@ -21,7 +21,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-nt-max"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
@@ -176,7 +175,6 @@
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
AdditionalOptions=
"/D MYSQL_SERVER_SUFFIX=-nt"
Optimization=
"2"
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
...
...
config/ac-macros/openssl.m4
View file @
b492d05e
...
...
@@ -14,7 +14,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \
/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \
/usr/freeware/lib32 /usr/local/lib/ ; do
if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl.dylib ; then
# Just to be safe, we test for ".so" anyway
if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext_cmds ; then
OPENSSL_LIB=$d
fi
done
...
...
@@ -26,7 +27,8 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [
if test -f $incs/openssl/ssl.h ; then
OPENSSL_INCLUDE=-I$incs
fi
if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl.dylib ; then
# Just to be safe, we test for ".so" anyway
if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext_cmds ; then
OPENSSL_LIB=$libs
fi
;;
...
...
config/ac-macros/yassl.m4
View file @
b492d05e
...
...
@@ -17,7 +17,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
yassl_dir="extra/yassl"
yassl_libs="-L\$(top_srcdir)/extra/yassl/src -lyassl -L\$(top_srcdir)/extra/yassl/taocrypt/src -ltaocrypt"
yassl_includes="-I\$(top_srcdir)/extra/yassl/include"
yassl_libs_with_path="\$(top_srcdir)/extra/yassl/src/libyassl.la \$(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la"
AC_DEFINE([HAVE_OPENSSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
AC_DEFINE([HAVE_YASSL], [1], [Defined by configure. Using yaSSL for OpenSSL emulation.])
# System specific checks
...
...
@@ -38,7 +37,6 @@ AC_DEFUN([MYSQL_CHECK_YASSL], [
AC_MSG_RESULT(no)
fi
AC_SUBST(yassl_libs)
AC_SUBST(yassl_libs_with_path)
AC_SUBST(yassl_includes)
AC_SUBST(yassl_dir)
AM_CONDITIONAL([HAVE_YASSL], [ test "with_yassl" = "yes" ])
...
...
config/ac-macros/zlib.m4
View file @
b492d05e
...
...
@@ -13,9 +13,9 @@ mysql_cv_compress="yes"
dnl Auxiliary macro to check for zlib at given path
AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [
save_
INCLUDES="$INCLUDE
S"
save_
CPPFLAGS="$CPPFLAG
S"
save_LIBS="$LIBS"
INCLUDES="$INCLUDES $ZLIB_INCLUDE
S"
CPPFLAGS="$ZLIB_INCLUDES $CPPFLAG
S"
LIBS="$LIBS $ZLIB_LIBS"
AC_CACHE_VAL([mysql_cv_compress],
[AC_TRY_LINK([#include <zlib.h>],
...
...
@@ -24,7 +24,7 @@ AC_CACHE_VAL([mysql_cv_compress],
AC_MSG_RESULT([ok])],
[mysql_cv_compress="no"])
])
INCLUDES="$save_INCLUDE
S"
CPPFLAGS="$save_CPPFLAG
S"
LIBS="$save_LIBS"
])
...
...
@@ -89,8 +89,9 @@ case $SYSTEM_TYPE in
fi
;;
*)
# Just to be safe, we test for ".so" anyway
if test \( -f "$mysql_zlib_dir/lib/libz.a" -o -f "$mysql_zlib_dir/lib/libz.so" -o \
-f "$mysql_zlib_dir/lib/libz
.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib
" \) \
-f "$mysql_zlib_dir/lib/libz
$shrext_cmds
" \) \
-a -f "$mysql_zlib_dir/include/zlib.h"; then
ZLIB_INCLUDES="-I$mysql_zlib_dir/include"
ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
...
...
libmysql/Makefile.am
View file @
b492d05e
...
...
@@ -29,7 +29,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
include
$(srcdir)/Makefile.shared
libmysqlclient_la_SOURCES
=
$(target_sources)
libmysqlclient_la_LIBADD
=
$(target_libadd)
$(yassl_libs_with_path)
libmysqlclient_la_LIBADD
=
$(target_libadd)
if
HAVE_YASSL
libmysqlclient_la_LIBADD
+=
$(top_srcdir)
/extra/yassl/src/libyassl.la
\
$(top_srcdir)
/extra/yassl/taocrypt/src/libtaocrypt.la
endif
libmysqlclient_la_LDFLAGS
=
$(target_ldflags)
EXTRA_DIST
=
Makefile.shared libmysql.def dll.c mytest.c cmakelists.txt
noinst_HEADERS
=
client_settings.h
...
...
libmysql_r/Makefile.am
View file @
b492d05e
...
...
@@ -32,7 +32,11 @@ include $(top_srcdir)/libmysql/Makefile.shared
libmysql_dir
=
$(top_srcdir)
/libmysql
libmysqlclient_r_la_SOURCES
=
$(target_sources)
libmysqlclient_r_la_LIBADD
=
$(target_libadd)
$(yassl_libs_with_path)
libmysqlclient_r_la_LIBADD
=
$(target_libadd)
if
HAVE_YASSL
libmysqlclient_r_la_LIBADD
+=
$(top_srcdir)
/extra/yassl/src/libyassl.la
\
$(top_srcdir)
/extra/yassl/taocrypt/src/libtaocrypt.la
endif
libmysqlclient_r_la_LDFLAGS
=
$(target_ldflags)
# This is called from the toplevel makefile
...
...
mysql-test/Makefile.am
View file @
b492d05e
...
...
@@ -22,12 +22,14 @@ DIST_SUBDIRS=ndb
benchdir_root
=
$(prefix)
testdir
=
$(benchdir_root)
/mysql-test
EXTRA_SCRIPTS
=
mysql-test-run.sh
mysql-test-run.pl install_test_db.sh valgrind.supp
EXTRA_SCRIPTS
=
mysql-test-run.sh
install_test_db.sh valgrind.supp
$(PRESCRIPTS)
EXTRA_DIST
=
$(EXTRA_SCRIPTS)
test_SCRIPTS
=
mysql-test-run install_test_db
GENSCRIPTS
=
mysql-test-run install_test_db
PRESCRIPTS
=
mysql-test-run.pl
test_SCRIPTS
=
$(GENSCRIPTS)
$(PRESCRIPTS)
test_DATA
=
std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
\
std_data/server-cert.pem std_data/server-key.pem
CLEANFILES
=
$(
test_
SCRIPTS)
$(test_DATA)
CLEANFILES
=
$(
GEN
SCRIPTS)
$(test_DATA)
INCLUDES
=
-I
$(top_builddir)
/include
-I
$(top_srcdir)
/include
-I
..
EXTRA_PROGRAMS
=
mysql_test_run_new
...
...
netware/mysql_install_db.c
View file @
b492d05e
...
...
@@ -423,7 +423,7 @@ int main(int argc, char **argv)
printf
(
"
\n
The latest information about MySQL is available on the web at
\n
"
);
printf
(
"
\t
http://www.mysql.com
\n
"
);
printf
(
"
\n
Support MySQL by buying support at http
s://order
.mysql.com
\n\n
"
);
printf
(
"
\n
Support MySQL by buying support at http
://shop
.mysql.com
\n\n
"
);
return
0
;
}
scripts/mysql_install_db.sh
View file @
b492d05e
#!/bin/sh
# Copyright (C) 2002-2003 MySQL AB
# For a more info consult the file COPYRIGHT distributed with this file.
...
...
@@ -269,7 +270,7 @@ then
echo
echo
"The latest information about MySQL is available on the web at"
echo
"http://www.mysql.com"
echo
"Support MySQL by buying support/licenses at http
s://order
.mysql.com"
echo
"Support MySQL by buying support/licenses at http
://shop
.mysql.com"
fi
exit
0
else
...
...
sql/item.cc
View file @
b492d05e
...
...
@@ -532,8 +532,9 @@ bool Item_field::collect_item_field_processor(byte *arg)
RETURN
TRUE if 'this' references the field 'arg'
FAL
E
otherwise
FAL
SE
otherwise
*/
bool
Item_field
::
find_item_in_field_list_processor
(
byte
*
arg
)
{
KEY_PART_INFO
*
first_non_group_part
=
*
((
KEY_PART_INFO
**
)
arg
);
...
...
support-files/mysql.spec.sh
View file @
b492d05e
%define mysql_version @VERSION@
# use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
...
...
@@ -217,6 +218,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
CXX=
\"
${
CXX
:-
$MYSQL_BUILD_CXX
}
\"
\
CFLAGS=
\"
$CFLAGS
\"
\
CXXFLAGS=
\"
$CXXFLAGS
\"
\
LDFLAGS=
\"
$MYSQL_BUILD_LDFLAGS
\"
\
./configure
\
$*
\
--with-mysqld-ldflags='-static'
\
...
...
@@ -709,6 +711,10 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
*
Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
- Set
$LDFLAGS
from
$MYSQL_BUILD_LDFLAGS
*
Wed Mar 07 2006 Kent Boortz <kent@mysql.com>
- Changed product name from
"Community Edition"
to
"Community Server"
...
...
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