Below is the list of changes that have just been committed into a local
5.0 repository of knielsen. When knielsen does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-08-08 13:27:04+02:00, knielsen@ymer.(none) +28 -0
Fix Windows CMake build, moving source files out of VC++Files/ and adding
files missing from 'make dist'.
Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +2 -3
Fix syntax error.
Add missing files for 'make dist'.
bdb/Makefile.in@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
client/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
dbug/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +2 -1
Fix syntax error.
Add missing files for 'make dist'.
extra/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
extra/yassl/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
extra/yassl/taocrypt/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
heap/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
innobase/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
libmysql/CMakeLists.txt@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
libmysql/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
libmysql/mytest.c@stripped, 2006-08-08 12:49:22+02:00, knielsen@ymer.(none) +0 -0
bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c
libmysql/mytest.c@stripped, 2004-12-09 14:44:02+01:00, guilhem@stripped +1 -0
explicit mention of reconnect (no behaviour change)
libmysql/mytest.c@stripped, 2003-11-23 14:36:38+02:00, monty@stripped +26 -22
Fixed compiler warnings from Intel compiler
libmysql/mytest.c@stripped, 2002-08-29 18:19:59+03:00, monty@stripped +1 -1
Removed compiler warning for VC++
libmysql/mytest.c@stripped, 2002-06-28 17:25:55+03:00, monty@stripped +170 -0
libmysql/mytest.c@stripped, 2002-06-28 17:25:55+03:00, monty@stripped +0 -0
BitKeeper file /my/bk/mysql-4.0/VC++Files/libmysqltest/mytest.c
myisam/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
myisammrg/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
mysys/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +2 -1
Fix syntax error.
Add missing files for 'make dist'.
regex/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
server-tools/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
server-tools/instance-manager/CMakeLists.txt@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
server-tools/instance-manager/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +3 -0
Fix syntax error.
Add missing files for 'make dist'.
sql/CMakeLists.txt@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +3 -3
Fix syntax error.
Add missing files for 'make dist'.
sql/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +2 -1
Fix syntax error.
Add missing files for 'make dist'.
sql/examples/CMakeLists.txt@stripped, 2006-08-08 12:55:14+02:00, knielsen@ymer.(none) +0 -0
Rename: sql/examples/CmakeLists.txt -> sql/examples/CMakeLists.txt
sql/message.mc@stripped, 2006-08-08 13:14:39+02:00, knielsen@ymer.(none) +0 -0
bk cp VC++Files/sql/message.mc sql/message.mc
sql/message.mc@stripped, 2004-08-27 01:06:29+02:00, rburnett@stripped +8 -0
sql/message.mc@stripped, 2004-08-27 01:06:29+02:00, rburnett@stripped +0 -0
BitKeeper file /users/rburnett/mysql-4.0/VC++Files/sql/message.mc
strings/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
tests/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +2 -1
Fix syntax error.
Add missing files for 'make dist'.
vio/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -0
Fix syntax error.
Add missing files for 'make dist'.
win/README@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +82 -0
New BitKeeper file ``win/README''
win/README@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +0 -0
zlib/Makefile.am@stripped, 2006-08-08 13:27:02+02:00, knielsen@ymer.(none) +1 -1
Fix syntax error.
Add missing files for 'make dist'.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: knielsen
# Host: ymer.(none)
# Root: /usr/local/mysql/mysql-5.0-cmake
--- 1.85/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.86/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -20,21 +20,20 @@ AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
- README COPYING EXCEPTIONS-CLIENT
+ README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
@readline_topdir@ sql-common \
@thread_dirs@ pstack \
@sql_union_dirs@ scripts @man_dirs@ tests \
netware @libmysqld_dirs@ \
@bench_dirs@ support-files @tools_dirs@
- win
DIST_SUBDIRS = . include @docs_dirs@ zlib \
@readline_topdir@ sql-common \
@thread_dirs@ pstack \
@sql_union_dirs@ scripts @man_dirs@ tests SSL\
BUILD netware os2 @libmysqld_dirs@ \
- @bench_dirs@ support-files @tools_dirs@ \
+ @bench_dirs@ support-files @tools_dirs@ win
# Run these targets before any others, also make part of clean target,
# to make sure we create new links after a clean.
--- 1.55/client/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.56/client/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -57,6 +57,7 @@ strings_src=decimal.c
DEFS = -DUNDEF_THREADS_HACK \
-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
-DDATADIR="\"$(localstatedir)\""
+EXTRA_DIST = get_password.c CMakeLists.txt
link_sources:
for f in $(sql_src) ; do \
--- 1.14/dbug/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.15/dbug/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -22,7 +22,8 @@ noinst_HEADERS = dbug_long.h
libdbug_a_SOURCES = dbug.c sanity.c
EXTRA_DIST = example1.c example2.c example3.c \
user.r monty.doc readme.prof dbug_add_tags.pl \
- my_main.c main.c factorial.c dbug_analyze.c
+ my_main.c main.c factorial.c dbug_analyze.c \
+ CMakeLists.txt
NROFF_INC = example1.r example2.r example3.r main.r \
factorial.r output1.r output2.r output3.r \
output4.r output5.r
--- 1.32/extra/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.33/extra/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -43,6 +43,7 @@ $(top_builddir)/include/sql_state.h: $(t
bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
resolve_stack_dump mysql_waitpid innochecksum
noinst_PROGRAMS = charset2html
+EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.10/heap/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.11/heap/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -28,6 +28,7 @@ libheap_a_SOURCES = hp_open.c hp_extra.c
hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
hp_rkey.c hp_block.c \
hp_hash.c _check.c _rectest.c hp_static.c
+EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.50/libmysql/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.51/libmysql/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -31,7 +31,7 @@ include $(srcdir)/Makefile.shared
libmysqlclient_la_SOURCES = $(target_sources)
libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_las)
libmysqlclient_la_LDFLAGS = $(target_ldflags)
-EXTRA_DIST = Makefile.shared libmysql.def
+EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c CMakeLists.txt
noinst_HEADERS = client_settings.h
# This is called from the toplevel makefile
--- 1.31/myisam/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.32/myisam/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -14,7 +14,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-EXTRA_DIST = mi_test_all.sh mi_test_all.res
+EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt
pkgdata_DATA = mi_test_all mi_test_all.res
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
--- 1.14/myisammrg/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.15/myisammrg/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -23,6 +23,7 @@ libmyisammrg_a_SOURCES = myrg_open.c myr
myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \
myrg_rnext_same.c
+EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.70/mysys/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.71/mysys/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -58,7 +58,8 @@ libmysys_a_SOURCES = my_init.c my_get
my_memmem.c \
my_windac.c my_access.c base64.c my_libwrap.c
EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
- thr_mutex.c thr_rwlock.c
+ thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \
+ my_wincond.c my_winsem.c my_winthread.c CMakeLists.txt
libmysys_a_LIBADD = @THREAD_LOBJECTS@
# test_dir_DEPENDENCIES= $(LIBRARIES)
# testhash_DEPENDENCIES= $(LIBRARIES)
--- 1.14/regex/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.15/regex/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -25,7 +25,7 @@ re_SOURCES = split.c debug.c main.c
re_LDFLAGS= @NOINST_LDFLAGS@
EXTRA_DIST = tests CHANGES COPYRIGHT WHATSNEW regexp.c \
debug.ih engine.ih main.ih regcomp.ih regerror.ih \
- regex.3 regex.7
+ regex.3 regex.7 CMakeLists.txt
test: re tests
./re < tests
--- 1.119/sql/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.120/sql/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -116,7 +116,8 @@ DEFS = -DMYSQL_SERVER \
@DEFS@
BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST = $(BUILT_SOURCES)
+EXTRA_DIST = $(BUILT_SOURCES) nt_servc.cc nt_servc.h \
+ message.mc examples/CMakeLists.txt CMakeLists.txt
DISTCLEANFILES = lex_hash.h
AM_YFLAGS = -d
--- 1.50/strings/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.51/strings/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -53,7 +53,7 @@ EXTRA_DIST = ctype-big5.c ctype-cp932.c
bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \
strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
- t_ctype.h
+ t_ctype.h CMakeLists.txt
libmystrings_a_LIBADD=
conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
--- 1.26/tests/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.27/tests/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -29,7 +29,8 @@ EXTRA_DIST = auto_increment.res auto_in
insert_and_repair.pl \
grant.pl grant.res test_delayed_insert.pl \
pmail.pl mail_to_db.pl table_types.pl \
- udf_test udf_test.res myisam-big-rows.tst
+ udf_test udf_test.res myisam-big-rows.tst \
+ CMakeLists.txt
bin_PROGRAMS = mysql_client_test
noinst_PROGRAMS = insert_test select_test thread_test
--- 1.18/vio/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.19/vio/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -38,6 +38,7 @@ test_sslclient_LDADD= @CLIENT_EXTRA_LD
../mysys/libmysys.a ../strings/libmystrings.a \
$(openssl_libs) $(yassl_libs)
libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c
+EXTRA_DIST= CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- 1.1/libmysql/CMakeLists.txt 2006-08-08 13:27:09 +02:00
+++ 1.2/libmysql/CMakeLists.txt 2006-08-08 13:27:09 +02:00
@@ -50,5 +50,5 @@ ADD_LIBRARY(libmysql MODULE dll.c libmys
ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib yassl taocrypt)
TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32)
-ADD_EXECUTABLE(myTest ../VC++Files/libmysqltest/mytest.c)
+ADD_EXECUTABLE(myTest mytest.c)
TARGET_LINK_LIBRARIES(myTest libmysql)
--- 1.1/server-tools/instance-manager/CMakeLists.txt 2006-08-08 13:27:09 +02:00
+++ 1.2/server-tools/instance-manager/CMakeLists.txt 2006-08-08 13:27:09 +02:00
@@ -8,7 +8,7 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR
ADD_EXECUTABLE(mysqlmanager buffer.cc command.cc commands.cc guardian.cc instance.cc instance_map.cc
instance_options.cc listener.cc log.cc manager.cc messages.cc mysql_connection.cc
mysqlmanager.cc options.cc parse.cc parse_output.cc priv.cc protocol.cc
- thread_registry.cc user_map.cc imservice.cpp windowsservice.cpp
+ thread_registry.cc user_map.cc IMService.cpp WindowsService.cpp
../../sql/net_serv.cc ../../sql-common/pack.c ../../sql/password.c
../../sql/sql_state.c ../../sql-common/client.c ../../libmysql/get_password.c
../../libmysql/errmsg.c)
--- 1.1/sql/CMakeLists.txt 2006-08-08 13:27:09 +02:00
+++ 1.2/sql/CMakeLists.txt 2006-08-08 13:27:09 +02:00
@@ -98,10 +98,10 @@ ADD_CUSTOM_COMMAND(
# Windows message file
ADD_CUSTOM_COMMAND(
- SOURCE ${PROJECT_SOURCE_DIR}/VC++Files/sql/message.mc
+ SOURCE ${PROJECT_SOURCE_DIR}/sql/message.mc
OUTPUT message.rc message.h
- COMMAND mc ARGS ${PROJECT_SOURCE_DIR}/VC++Files/sql/message.mc
- DEPENDS ${PROJECT_SOURCE_DIR}/VC++Files/sql/message.mc)
+ COMMAND mc ARGS ${PROJECT_SOURCE_DIR}/sql/message.mc
+ DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc)
# Gen_lex_hash
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
--- New file ---
+++ win/README 06/08/08 13:27:02
Windows building readme
======================================
----------------IMPORTANT----------------------------
This readme outlines the instructions for building
MySQL for Windows staring from version 5.0.
This readme does not apply to MySQL versions 5.1
or ealier.
-----------------------------------------------------
The Windows build system uses a tool named CMake to generate build files for
a variety of project systems. This tool is combined with a set of jscript
files to enable building of MySQL for Windows directly out of a bk clone.
The steps required are below.
Step 1
------
Download and install CMake. It can be downloaded from http://www.cmake.org.
Once it is installed, modify your path to make sure you can execute
the cmake binary.
Step 2
------
Download and install bison for Windows. It can be downloaded from
http://gnuwin32.sourceforge.net/packages/bison.htm. Please download using
the link named "Complete package, excluding sources". This includes an
installer that will install bison. After the installer finishes, modify
your path so that you can execute bison.
Step 3
------
Clone your bk tree to any location you like.
Step 4
------
From the root of your bk clone, execute the command: win\configure <options>.
The options right now are
WITH_INNOBASE_STORAGE_ENGINE Enable particular storage engines
WITH_PARTITION_STORAGE_ENGINE
WITH_ARCHIVE_STORAGE_ENGINE
WITH_BERKELEY_STORAGE_ENGINE
WITH_BLACKHOLE_STORAGE_ENGINE
WITH_EXAMPLE_STORAGE_ENGINE
WITH_FEDERATED_STORAGE_ENGINE
WITH_INNOBASE_STORAGE_ENGINE
__NT__ Enable named pipe support
MYSQL_SERVER_SUFFIX=<suffix> Server suffix, default none
COMPILATION_COMMENT=<comment> Server comment, default "Source distribution"
MYSQL_TCP_PORT=<port> Server port, default 3306
CYBOZU
So the command line could look like:
win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-pro
Step 5
------
From the root of your bk clone, execute one of the batch files to generate the type
of project files you desire.
For Visual Studio 8, do win\build-vs8.
For Visual Studio 7.1, do win\build-vs71.
We will support building with nmake in the near future.
Step 6
------
From the root of your bk clone, start your build.
For Visual Studio, simply execute mysql.sln. This will start the IDE and you can
click the build solution menu option.
Current issues
--------------
1. After changing configuration (eg. adding or removing a storage engine), it
may be necessary to clean the build tree to remove any stale objects.
2. To use Visual C++ Express Edition you also need to install the Platform SDK.
Please see this link: http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/
At step 4 you only need to add the libraries advapi32.lib and user32.lib to
the file "corewin_express.vsprops" in order to avoid link errors.
--- 1.9/zlib/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.10/zlib/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -29,5 +29,5 @@ libz_la_SOURCES= adler32.c compress.c cr
infback.c inffast.c inflate.c inftrees.c trees.c \
uncompr.c zutil.c
-EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3
+EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt
--- 1.1/server-tools/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.2/server-tools/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -1 +1,2 @@
SUBDIRS= instance-manager
+DIST_SUBDIRS = instance-manager
--- 1.32/server-tools/instance-manager/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.33/server-tools/instance-manager/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -19,6 +19,9 @@ INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
+EXTRA_DIST = IMService.cpp IMService.h WindowsService.cpp WindowsService.h \
+ CMakeLists.txt
+
# As all autoconf variables depend from ${prefix} and being resolved only when
# make is run, we can not put these defines to a header file (e.g. to
# default_options.h, generated from default_options.h.in)
--- 1.6/innobase/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.7/innobase/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -25,6 +25,7 @@ noinst_HEADERS = ib_config.h
SUBDIRS = os ut btr buf data dict dyn eval fil fsp fut \
ha ibuf include lock log mach mem mtr page \
pars que read rem row srv sync thr trx usr
+EXTRA_DIST = CMakeLists.txt
# Don't update the files from bitkeeper
%::SCCS/s.%
--- New file ---
+++ libmysql/mytest.c 02/06/28 17:25:55
/*C4*/
/****************************************************************/
/* Author: Jethro Wright, III TS : 3/ 4/1998 9:15 */
/* Date: 02/18/1998 */
/* mytest.c : do some testing of the libmySQL.DLL.... */
/* */
/* History: */
/* 02/18/1998 jw3 also sprach zarathustra.... */
/****************************************************************/
#include <windows.h>
#include <stdio.h>
#include <string.h>
#include <mysql.h>
#define DEFALT_SQL_STMT "SELECT * FROM db"
#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif
/********************************************************
**
** main :-
**
********************************************************/
int
main( int argc, char * argv[] )
{
char szSQL[ 200 ], aszFlds[ 25 ][ 25 ], szDB[ 50 ] ;
const char *pszT;
int i, j, k, l, x ;
MYSQL * myData ;
MYSQL_RES * res ;
MYSQL_FIELD * fd ;
MYSQL_ROW row ;
//....just curious....
printf( "sizeof( MYSQL ) == %d\n", (int) sizeof( MYSQL ) ) ;
if ( argc == 2 )
{
strcpy( szDB, argv[ 1 ] ) ;
strcpy( szSQL, DEFALT_SQL_STMT ) ;
if (!strcmp(szDB,"--debug"))
{
strcpy( szDB, "mysql" ) ;
printf("Some mysql struct information (size and offset):\n");
printf("net:\t%3d %3d\n",(int) sizeof(myData->net),
(int) offsetof(MYSQL,net));
printf("host:\t%3d %3d\n",(int) sizeof(myData->host),
(int) offsetof(MYSQL,host));
printf("port:\t%3d %3d\n", (int) sizeof(myData->port),
(int) offsetof(MYSQL,port));
printf("protocol_version:\t%3d %3d\n",
(int) sizeof(myData->protocol_version),
(int) offsetof(MYSQL,protocol_version));
printf("thread_id:\t%3d %3d\n",(int) sizeof(myData->thread_id),
(int) offsetof(MYSQL,thread_id));
printf("affected_rows:\t%3d %3d\n",(int) sizeof(myData->affected_rows),
(int) offsetof(MYSQL,affected_rows));
printf("packet_length:\t%3d %3d\n",(int) sizeof(myData->packet_length),
(int) offsetof(MYSQL,packet_length));
printf("status:\t%3d %3d\n",(int) sizeof(myData->status),
(int) offsetof(MYSQL,status));
printf("fields:\t%3d %3d\n",(int) sizeof(myData->fields),
(int) offsetof(MYSQL,fields));
printf("field_alloc:\t%3d %3d\n",(int) sizeof(myData->field_alloc),
(int) offsetof(MYSQL,field_alloc));
printf("free_me:\t%3d %3d\n",(int) sizeof(myData->free_me),
(int) offsetof(MYSQL,free_me));
printf("options:\t%3d %3d\n",(int) sizeof(myData->options),
(int) offsetof(MYSQL,options));
puts("");
}
}
else if ( argc > 2 ) {
strcpy( szDB, argv[ 1 ] ) ;
strcpy( szSQL, argv[ 2 ] ) ;
}
else {
strcpy( szDB, "mysql" ) ;
strcpy( szSQL, DEFALT_SQL_STMT ) ;
}
//....
if ( (myData = mysql_init((MYSQL*) 0)) &&
mysql_real_connect( myData, NULL, NULL, NULL, NULL, MYSQL_PORT,
NULL, 0 ) )
{
myData->reconnect= 1;
if ( mysql_select_db( myData, szDB ) < 0 ) {
printf( "Can't select the %s database !\n", szDB ) ;
mysql_close( myData ) ;
return 2 ;
}
}
else {
printf( "Can't connect to the mysql server on port %d !\n",
MYSQL_PORT ) ;
mysql_close( myData ) ;
return 1 ;
}
//....
if ( ! mysql_query( myData, szSQL ) ) {
res = mysql_store_result( myData ) ;
i = (int) mysql_num_rows( res ) ; l = 1 ;
printf( "Query: %s\nNumber of records found: %ld\n", szSQL, i ) ;
//....we can get the field-specific characteristics here....
for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )
strcpy( aszFlds[ x ], fd->name ) ;
//....
while ( row = mysql_fetch_row( res ) ) {
j = mysql_num_fields( res ) ;
printf( "Record #%ld:-\n", l++ ) ;
for ( k = 0 ; k < j ; k++ )
printf( " Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],
(((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;
puts( "==============================\n" ) ;
}
mysql_free_result( res ) ;
}
else printf( "Couldn't execute %s on the server !\n", szSQL ) ;
//....
puts( "==== Diagnostic info ====" ) ;
pszT = mysql_get_client_info() ;
printf( "Client info: %s\n", pszT ) ;
//....
pszT = mysql_get_host_info( myData ) ;
printf( "Host info: %s\n", pszT ) ;
//....
pszT = mysql_get_server_info( myData ) ;
printf( "Server info: %s\n", pszT ) ;
//....
res = mysql_list_processes( myData ) ; l = 1 ;
if (res)
{
for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )
strcpy( aszFlds[ x ], fd->name ) ;
while ( row = mysql_fetch_row( res ) ) {
j = mysql_num_fields( res ) ;
printf( "Process #%ld:-\n", l++ ) ;
for ( k = 0 ; k < j ; k++ )
printf( " Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],
(((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;
puts( "==============================\n" ) ;
}
}
else
{
printf("Got error %s when retreiving processlist\n",mysql_error(myData));
}
//....
res = mysql_list_tables( myData, "%" ) ; l = 1 ;
for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )
strcpy( aszFlds[ x ], fd->name ) ;
while ( row = mysql_fetch_row( res ) ) {
j = mysql_num_fields( res ) ;
printf( "Table #%ld:-\n", l++ ) ;
for ( k = 0 ; k < j ; k++ )
printf( " Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],
(((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;
puts( "==============================\n" ) ;
}
//....
pszT = mysql_stat( myData ) ;
puts( pszT ) ;
//....
mysql_close( myData ) ;
return 0 ;
}
--- New file ---
+++ sql/message.mc 04/08/27 01:06:29
MessageId = 100
Severity = Error
Facility = Application
SymbolicName = MSG_DEFAULT
Language = English
%1For more information, see Help and Support Center at http://www.mysql.com.
--- 1.3/extra/yassl/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.4/extra/yassl/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -1,2 +1,2 @@
SUBDIRS = taocrypt src testsuite
-EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)
+EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) CMakeLists.txt
--- 1.3/extra/yassl/taocrypt/Makefile.am 2006-08-08 13:27:09 +02:00
+++ 1.4/extra/yassl/taocrypt/Makefile.am 2006-08-08 13:27:09 +02:00
@@ -1,2 +1,2 @@
SUBDIRS = src test benchmark
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp
+EXTRA_DIST = taocrypt.dsw taocrypt.dsp CMakeLists.txt
--- 1.6/bdb/Makefile.in 2006-08-08 13:27:09 +02:00
+++ 1.7/bdb/Makefile.in 2006-08-08 13:27:09 +02:00
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
# distdir and top_distdir are set by the calling Makefile
bdb_build = build_unix
-files = LICENSE Makefile Makefile.in README
+files = LICENSE Makefile Makefile.in README CMakeLists.txt
subdirs = btree build_vxworks build_win32 clib common cxx db dbinc \
dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \
db_dump185 db_load db_printlog db_recover db_stat db_upgrade \
| Thread |
|---|
| • bk commit into 5.0 tree (knielsen:1.2238) | knielsen | 8 Aug |
