Skip to content

M
MariaDB
Commit da7016ee authored by unknown's avatar unknown
Browse files
Options

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 2a2f219c ddb679ed
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 62 deletions
Makefile.am
View file @ da7016ee
...@@ -42,6 +42,14 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \ ...@@ -42,6 +42,14 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = ac_available_languages_fragment DISTCLEANFILES = ac_available_languages_fragment
# Our current filtering of "sql_yacc.cc" in "sql/Makefile.am" creates
# a problem, if a VPATH build and "sql_yacc.cc" was part of the source
# distribution we end up with one "sql_yacc.cc" in the source tree,
# and one in the build tree. This breaks "distcleancheck", until this
# is sorted out we redefine the find that scans for files not removed
distcleancheck_listfiles = find . -name sql_yacc.cc -o -type f -print
linked_include_sources: linked_include_sources:
cd include; $(MAKE) link_sources cd include; $(MAKE) link_sources
echo timestamp > linked_include_sources echo timestamp > linked_include_sources
...@@ -86,17 +94,11 @@ bin-dist: all ...@@ -86,17 +94,11 @@ bin-dist: all
dist-hook: dist-hook:
rm -rf `find $(distdir) -type d -name SCCS -print` rm -rf `find $(distdir) -type d -name SCCS -print`
rm -f `find $(distdir) -type l -print` rm -f `find $(distdir) -type l -print`
if echo "$(distdir)" | grep -q '^/' ; then \ mkdir -p $(distdir)/win
mkdir -p "$(distdir)/win" ; \ scripts/mysql_install_db --no-defaults --windows \
scripts/mysql_install_db --no-defaults --windows \ --basedir=$(top_builddir) \
--basedir=$(top_srcdir) \ --datadir=$(distdir)/win/data \
--datadir="$(distdir)/win/data"; \ --srcdir=$(top_srcdir)
else \
mkdir -p "$$(pwd)/$(distdir)/win" ; \
scripts/mysql_install_db --no-defaults --windows \
--basedir=$(top_srcdir) \
--datadir="$$(pwd)/$(distdir)/win/data"; \
fi
tags: tags:
support-files/build-tags support-files/build-tags
......
include/Makefile.am
View file @ da7016ee
...@@ -15,14 +15,18 @@ ...@@ -15,14 +15,18 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA # MA 02111-1307, USA
BUILT_SOURCES = mysql_version.h my_config.h # FIXME 'abi_check' should be in BUILT_SOURCES, disabled for now
pkginclude_HEADERS = my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \ BUILT_SOURCES = $(HEADERS_GEN)
mysql.h mysql_com.h mysql_embed.h \ HEADERS_GEN = mysql_version.h my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
my_list.h my_alloc.h typelib.h
pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
my_xml.h mysql_embed.h \
my_semaphore.h my_pthread.h my_no_pthread.h \ my_semaphore.h my_pthread.h my_no_pthread.h \
errmsg.h my_global.h my_net.h my_alloc.h \ errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h typelib.h \ my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
mysql_time.h m_ctype.h mysql/plugin.h $(BUILT_SOURCES) m_ctype.h mysql/plugin.h $(HEADERS_GEN)
noinst_HEADERS = config-win.h config-netware.h \ noinst_HEADERS = config-win.h config-netware.h \
heap.h my_bitmap.h my_uctype.h \ heap.h my_bitmap.h my_uctype.h \
myisam.h myisampack.h myisammrg.h ft_global.h\ myisam.h myisampack.h myisammrg.h ft_global.h\
...@@ -61,8 +65,7 @@ dist-hook: ...@@ -61,8 +65,7 @@ dist-hook:
# #
# Create a icheck file and compare it to the reference # Create a icheck file and compare it to the reference
abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic
my_alloc.h typelib.h mysql_h.ic
@set -ex; \ @set -ex; \
if [ @ICHECK@ != no ] ; then \ if [ @ICHECK@ != no ] ; then \
@ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \
...@@ -70,8 +73,5 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ ...@@ -70,8 +73,5 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
fi; \ fi; \
touch abi_check; touch abi_check;
#all: abi_check
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
include/m_ctype.h
View file @ da7016ee
...@@ -446,7 +446,7 @@ int my_wildcmp_unicode(CHARSET_INFO *cs, ...@@ -446,7 +446,7 @@ int my_wildcmp_unicode(CHARSET_INFO *cs,
extern my_bool my_parse_charset_xml(const char *bug, uint len, extern my_bool my_parse_charset_xml(const char *bug, uint len,
int (*add)(CHARSET_INFO *cs)); int (*add)(CHARSET_INFO *cs));
extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, extern char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end,
char c); pchar c);
my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len); my_bool my_propagate_simple(CHARSET_INFO *cs, const uchar *str, uint len);
my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len); my_bool my_propagate_complex(CHARSET_INFO *cs, const uchar *str, uint len);
......
netware/BUILD/nwbootstrap
View file @ da7016ee
...@@ -172,8 +172,7 @@ nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1 ...@@ -172,8 +172,7 @@ nlm_version=`echo "$version" | sed -e "s;\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*;\1
for file in ./netware/*.def for file in ./netware/*.def
do do
mv -f $file $file.org mv -f $file $file.org
sed -e "s;VERSION.*;VERSION $nlm_version;g" \ sed -e "s;VERSION.*;VERSION $nlm_version;g" $file.org > $file
-e "s;XDCDATA.*;XDCDATA $SRC_DIR/netware/mysql.xdc;g" $file.org > $file
rm $file.org rm $file.org
done done
......
netware/Makefile.am
View file @ da7016ee
...@@ -30,8 +30,9 @@ netware_build_files = client/mysql.def client/mysqladmin.def \ ...@@ -30,8 +30,9 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
client/mysqlbinlog.def client/mysqlcheck.def \ client/mysqlbinlog.def client/mysqlcheck.def \
client/mysqldump.def client/mysqlimport.def \ client/mysqldump.def client/mysqlimport.def \
client/mysqlshow.def client/mysqltest.def \ client/mysqlshow.def client/mysqltest.def \
client/mysqlslap.def \ client/mysqlslap.def client/mysql_upgrade.def \
sql/mysqld.def extra/mysql_waitpid.def \ sql/mysqld.def extra/mysql_waitpid.def \
tests/mysql_client_test.def \
extra/my_print_defaults.def \ extra/my_print_defaults.def \
extra/perror.def extra/replace.def \ extra/perror.def extra/replace.def \
extra/resolveip.def extra/comp_err.def \ extra/resolveip.def extra/comp_err.def \
...@@ -73,7 +74,9 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ ...@@ -73,7 +74,9 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \
mysql_test_run.def mysql_waitpid.def mysqladmin.def \ mysql_test_run.def mysql_waitpid.def mysqladmin.def \
mysqlbinlog.def mysqlcheck.def mysqld.def \ mysqlbinlog.def mysqlcheck.def mysqld.def \
mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \ mysqld_safe.c mysqld_safe.def mysqldump.def mysqlimport.def \
mysqlshow.def mysqltest.def mysqlslap.def perror.def \ mysqlshow.def mysqltest.def mysqlslap.def mysql_upgrade.def \
perror.def \
mysql_client_test.def \
replace.def resolve_stack_dump.def resolveip.def test_db.sql \ replace.def resolve_stack_dump.def resolveip.def test_db.sql \
static_init_db.sql \ static_init_db.sql \
BUILD/apply-patch BUILD/compile-AUTOTOOLS \ BUILD/apply-patch BUILD/compile-AUTOTOOLS \
......
netware/comp_err.def
View file @ da7016ee
...@@ -5,6 +5,7 @@ MODULE libc.nlm ...@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Error File Compiler" DESCRIPTION "MySQL Error File Compiler"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/isamchk.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL ISAM Table Check Tool" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL ISAM Table Check Tool"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL ISAM Table Check Tool" DESCRIPTION "MySQL ISAM Table Check Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 65536 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/isamlog.def
View file @ da7016ee
...@@ -5,6 +5,7 @@ MODULE libc.nlm ...@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL ISAM Table Log Tool" DESCRIPTION "MySQL ISAM Table Log Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/libmysql.def
View file @ da7016ee
...@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res ...@@ -7,6 +7,6 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL Client Library" DESCRIPTION "MySQL Client Library"
VERSION 4, 0 VERSION 4, 0
AUTOUNLOAD AUTOUNLOAD
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/my_print_defaults.def
View file @ da7016ee
...@@ -5,7 +5,7 @@ MODULE libc.nlm ...@@ -5,7 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Print Defaults Tool" DESCRIPTION "MySQL Print Defaults Tool"
VERSION 5, 0, 17 VERSION 5, 0, 17
STACKSIZE 32767 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/myisam_ftdump.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Dump Tool" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Dump Tool"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Dump Tool" DESCRIPTION "MySQL MyISAM Table Dump Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 65536 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../../netware/mysql.xdc
#DEBUG #DEBUG
netware/myisamchk.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Check Tool[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Check Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Check Tool" DESCRIPTION "MySQL MyISAM Table Check Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 65536 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../../netware/mysql.xdc
#DEBUG #DEBUG
netware/myisamlog.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Log Tool"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Log Tool" DESCRIPTION "MySQL MyISAM Table Log Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../../netware/mysql.xdc
#DEBUG #DEBUG
netware/myisampack.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL MyISAM Table Pack Tool"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL MyISAM Table Pack Tool" DESCRIPTION "MySQL MyISAM Table Pack Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysql.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Monitor[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Monitor[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Monitor" DESCRIPTION "MySQL Monitor"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
MULTIPLE MULTIPLE
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
......
netware/mysql_client_test.def 0 → 100644
View file @ da7016ee
#------------------------------------------------------------------------------
# MySQL Test
#------------------------------------------------------------------------------
MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Client Test"
VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysql_install_db.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Install" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Install"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Initial Database Installer" DESCRIPTION "MySQL Initial Database Installer"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysql_test_run.def
View file @ da7016ee
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
# MySQL Test Run # MySQL Test Run
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
MODULE libc.nlm MODULE libc.nlm
STACKSIZE 65536
SCREENNAME "MySQL Test Run" SCREENNAME "MySQL Test Run"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Test Run" DESCRIPTION "MySQL Test Run"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysql_upgrade.def 0 → 100644
View file @ da7016ee
#------------------------------------------------------------------------------
# MySQL Admin
#------------------------------------------------------------------------------
MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Upgrade Tool"
VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc
#DEBUG
netware/mysql_waitpid.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ MODULE libc.nlm ...@@ -6,7 +6,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Tool - Wait for a Program to Terminate" DESCRIPTION "MySQL Tool - Wait for a Program to Terminate"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 65536 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqladmin.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Admin[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Admin Tool" DESCRIPTION "MySQL Admin Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqlbinlog.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Binary Log Dump Tool[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Binary Log Dump Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Binary Log Dump Tool" DESCRIPTION "MySQL Binary Log Dump Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqlcheck.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Check Tool[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Check Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Check Tool" DESCRIPTION "MySQL Check Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqld.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res ...@@ -6,7 +6,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL Database Server" DESCRIPTION "MySQL Database Server"
VERSION 4, 0 VERSION 4, 0
MULTIPLE MULTIPLE
STACKSIZE 65536 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqld_safe.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Database Server" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Database Server"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Database Server Monitor" DESCRIPTION "MySQL Database Server Monitor"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
MULTIPLE MULTIPLE
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
......
netware/mysqldump.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Dump Tool[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Dump Tool[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Dump Tool" DESCRIPTION "MySQL Dump Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqlimport.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Import[scrollable]" ...@@ -6,7 +6,7 @@ SCREENNAME "MySQL Import[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Import Tool" DESCRIPTION "MySQL Import Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqlshow.def
View file @ da7016ee
...@@ -6,6 +6,7 @@ SCREENNAME "MySQL Show[scrollable]" ...@@ -6,6 +6,7 @@ SCREENNAME "MySQL Show[scrollable]"
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Show Tool" DESCRIPTION "MySQL Show Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/mysqltest.def
View file @ da7016ee
...@@ -5,6 +5,7 @@ MODULE libc.nlm ...@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Test Case Tool" DESCRIPTION "MySQL Test Case Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/pack_isam.def
View file @ da7016ee
...@@ -7,6 +7,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res ...@@ -7,6 +7,7 @@ COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Res
DESCRIPTION "MySQL ISAM Table Pack Tool" DESCRIPTION "MySQL ISAM Table Pack Tool"
SCREENNAME "MySQL ISAM Table Pack Tool" SCREENNAME "MySQL ISAM Table Pack Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/perror.def
View file @ da7016ee
...@@ -5,7 +5,7 @@ MODULE libc.nlm ...@@ -5,7 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Error Code Description Tool" DESCRIPTION "MySQL Error Code Description Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 32768 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/replace.def
View file @ da7016ee
...@@ -5,6 +5,7 @@ MODULE libc.nlm ...@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Text Replacement Tool" DESCRIPTION "MySQL Text Replacement Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/resolve_stack_dump.def
View file @ da7016ee
...@@ -6,7 +6,7 @@ MODULE libc.nlm ...@@ -6,7 +6,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL Stack Dump Resolve Tool" DESCRIPTION "MySQL Stack Dump Resolve Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 65536 STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
netware/resolveip.def
View file @ da7016ee
...@@ -5,6 +5,7 @@ MODULE libc.nlm ...@@ -5,6 +5,7 @@ MODULE libc.nlm
COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved." COPYRIGHT "(c) 2003-2005 Novell, Inc. Portions (c) 2003 MySQL AB. All Rights Reserved."
DESCRIPTION "MySQL IP/Hostname Resolve Tool" DESCRIPTION "MySQL IP/Hostname Resolve Tool"
VERSION 4, 0 VERSION 4, 0
STACKSIZE 131072
XDCDATA ../netware/mysql.xdc XDCDATA ../netware/mysql.xdc
#DEBUG #DEBUG
scripts/mysql_install_db.sh
View file @ da7016ee
...@@ -33,6 +33,7 @@ parse_arguments() { ...@@ -33,6 +33,7 @@ parse_arguments() {
case "$arg" in case "$arg" in
--force) force=1 ;; --force) force=1 ;;
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--srcdir=*) srcdir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --ldata=*|--datadir=*) ldata=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
--user=*) --user=*)
# Note that the user will be passed to mysqld so that it runs # Note that the user will be passed to mysqld so that it runs
...@@ -78,6 +79,7 @@ ldata= ...@@ -78,6 +79,7 @@ ldata=
execdir= execdir=
bindir= bindir=
basedir= basedir=
srcdir=
force=0 force=0
verbose=0 verbose=0
fill_help_tables="" fill_help_tables=""
...@@ -106,18 +108,24 @@ else ...@@ -106,18 +108,24 @@ else
fi fi
# find fill_help_tables.sh # find fill_help_tables.sh
for i in $basedir/support-files $basedir/share $basedir/share/mysql $basedir/scripts `pwd` `pwd`/scripts @pkgdatadir@ if test -n "$srcdir"
do
if test -f $i/fill_help_tables.sql
then
pkgdatadir=$i
fi
done
if test -f $pkgdatadir/fill_help_tables.sql
then then
fill_help_tables=$pkgdatadir/fill_help_tables.sql fill_help_tables=$srcdir/scripts/fill_help_tables.sql
else else
for i in $basedir/support-files $basedir/share $basedir/share/mysql \
$basedir/scripts `pwd` `pwd`/scripts @pkgdatadir@
do
if test -f $i/fill_help_tables.sql
then
pkgdatadir=$i
fi
done
fill_help_tables=$pkgdatadir/fill_help_tables.sql
fi
if test ! -f $fill_help_tables
then
echo "Could not find help file 'fill_help_tables.sql' in @pkgdatadir@ or inside $basedir". echo "Could not find help file 'fill_help_tables.sql' in @pkgdatadir@ or inside $basedir".
exit 1; exit 1;
fi fi
...@@ -130,7 +138,13 @@ scriptdir=$bindir ...@@ -130,7 +138,13 @@ scriptdir=$bindir
if test "$windows" = 1 if test "$windows" = 1
then then
mysqld="./sql/mysqld" mysqld="./sql/mysqld"
mysqld_opt="--language=./sql/share/english" if test -n "$srcdir" -a -f $srcdir/sql/share/english/errmsg.sys
then
langdir=$srcdir/sql/share/english
else
langdir=./sql/share/english
fi
mysqld_opt="--language=$langdir"
scriptdir="./scripts" scriptdir="./scripts"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7