Commit 126da692 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 866a8278 e595fe3b

BUILD/compile-pentium-debug-openssl

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs  --with-debug=full --with-vio --with-openssl"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
heikki@donna.mysql.fi

jani@janikt.pp.saunalahti.fi

monty@hundin.mysql.fi

monty@work.mysql.com

Docs/manual.texi

+3 −1
Original line number Diff line number Diff line
@@ -44926,7 +44926,9 @@ table for a different site you are working on, but the table is just a 
bit different (that is - fields in different order, etc.).

By Steve Shreeve.

@item @uref{http://www.mysql.com/Downloads/Contrib/oracledump, oracledump}

Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.

Perl program to convert Oracle databases to @strong{MySQL}. Has same

output format as mysqldump. By Johan Andersson.















@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}







































Makefile.am



+1
−1






























Original line number
Diff line number
Diff line








@@ -22,7 +22,7 @@ TAR =			gtar













EXTRA_DIST =		INSTALL-SOURCE README \















			COPYING COPYING.LIB MIRRORS















SUBDIRS =		include @docs_dirs@ @readline_dir@ \













			@thread_dirs@ @pstack_dirs@ @sql_client_dirs@ \













			@thread_dirs@ @pstack_dirs@ vio @sql_client_dirs@ \















			@sql_server_dirs@ @libmysqld_dirs@ scripts tests man \















			@bench_dirs@ support-files @fs_dirs@

















































bdb/include/rpc_server_ext.h
deleted100644 → 0



+0
−21






























Original line number
Diff line number
Diff line













/* DO NOT EDIT: automatically built by dist/s_include. */













#ifndef	_rpc_server_ext_h_













#define	_rpc_server_ext_h_













#if defined(__cplusplus)













extern "C" {













#endif













void __db_stats_freelist __P((__db_stat_statsreplist **));













void __dbsrv_settimeout __P((ct_entry *, u_int32_t));













void __dbsrv_timeout __P((int));













void __dbclear_ctp __P((ct_entry *));













void __dbdel_ctp __P((ct_entry *));













ct_entry *new_ct_ent __P((u_int32_t *));













ct_entry *get_tableent __P((long));













void __dbsrv_active __P((ct_entry *));













int __dbc_close_int __P((ct_entry *));













int __dbenv_close_int __P((long, int));













char *get_home __P((char *));













#if defined(__cplusplus)













}













#endif













#endif /* _rpc_server_ext_h_ */