database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity

Merge work:/my/mysql into tik.mysql.fi:/home/my/mysql

Browse Source
This commit is contained in:
monty@tik.mysql.fi
2001-05-28 02:49:12 +03:00
parent 75a62b98a8 38c035c098
commit 7ea5c8104b
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@@ -2,3 +2,4 @@ mwagner@evoq.mwagner.org
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
heikki@donna.mysql.fi heikki@donna.mysql.fi
miguel@linux.local miguel@linux.local
monty@tik.mysql.fi

10
Docs/manual.texi
View File

@@ -43642,6 +43642,11 @@ Some features:
@itemize @bullet @itemize @bullet
@item Manage servers, databases, tables, columns, indexes, and users @item Manage servers, databases, tables, columns, indexes, and users
@item Import wizard to import structure and data from MS Access, MS Excel, Dbase, FoxPro, Paradox, and ODBC Databases. @item Import wizard to import structure and data from MS Access, MS Excel, Dbase, FoxPro, Paradox, and ODBC Databases.
@item @uref{http://www.mysql.com/Downloads/Contrib/KMYENG113.zip,KMYENG113.zip}
An administrator GUI for @strong{MySQL}. Works only on windows, no source.
Available in English and Japanese. By Mitunobu Kaneko.
Home page: @uref{http://sql.jnts.ne.jp/}
@end itemize @end itemize
@item @uref{http://www.mysql.com/Downloads/Contrib/xmysqladmin-1.0.tar.gz, xmysqladmin-1.0.tar.gz} @item @uref{http://www.mysql.com/Downloads/Contrib/xmysqladmin-1.0.tar.gz, xmysqladmin-1.0.tar.gz}
@@ -43949,6 +43954,11 @@ By Steve Shreeve.
Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson. Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.
@item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql} @item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql}
Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca} Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}
@item @uref{http://www.mysql.com/Downloads/Contrib/T2S_100.ZIP, T2S_100.ZIP}.
Windows program to convert text files to @strong{MySQL} databases. By
Asaf Azulay.
@end itemize @end itemize
@appendixsec Using MySQL with Other Products @appendixsec Using MySQL with Other Products

6
configure.in
View File

@@ -285,8 +285,10 @@ export CC CFLAGS LD LDFLAGS
if test "$GXX" = "yes" if test "$GXX" = "yes"
then then
# mysqld requires this when compiled with gcc # mysqld requires -fno-implicit-templates.
CXXFLAGS="$CXXFLAGS -fno-implicit-templates" # Disable exceptions as they seams to create problems with gcc and threads.
# mysqld doesn't use run-time-type-checking, so we disable it.
CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
fi fi
# Avoid bug in fcntl on some versions of linux # Avoid bug in fcntl on some versions of linux

2
scripts/mysql_config.sh
View File

@@ -45,7 +45,7 @@ EOF
exit 1 exit 1
} }
if ! test $# -gt 0; then usage; fi if test $# -le 0; then usage; fi
while test $# -gt 0; do while test $# -gt 0; do
case $1 in case $1 in

6
sql/mysqld.cc
View File

@@ -3039,8 +3039,12 @@ static void usage(void)
--console Don't remove the console window\n\ --console Don't remove the console window\n\
--install Install mysqld as a service (NT)\n\ --install Install mysqld as a service (NT)\n\
--remove Remove mysqld from the service list (NT)\n\ --remove Remove mysqld from the service list (NT)\n\
--standalone Dummy option to start as a standalone program (NT)\n\ --standalone Dummy option to start as a standalone program (NT)\
"); ");
#ifdef USE_SYMDIR
puts("--use-symbolic-links Enable symbolic link support");
#endif
puts("");
#endif #endif
#ifdef HAVE_BERKELEY_DB #ifdef HAVE_BERKELEY_DB
puts("\ puts("\