From e19137f0379ce08b43165ce3fb89c1b03398d863 Mon Sep 17 00:00:00 2001 From: "tim@threads.polyesthetic.msg" <> Date: Tue, 17 Apr 2001 09:13:10 -0400 Subject: [PATCH 01/24] sql_select.cc sizeof(**TABLE) -> sizeof(*TABLE) in malloc() --- BitKeeper/etc/logging_ok | 1 + sql/sql_select.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 9f94b7a6bfd..ab43f834840 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ sasha@mysql.sashanet.com +tim@threads.polyesthetic.msg diff --git a/sql/sql_select.cc b/sql/sql_select.cc index db95214cfa3..9acadefc18d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -846,7 +846,7 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, table_count=join->tables; stat=(JOIN_TAB*) join->thd->calloc(sizeof(JOIN_TAB)*table_count); stat_ref=(JOIN_TAB**) join->thd->alloc(sizeof(JOIN_TAB*)*MAX_TABLES); - table_vector=(TABLE**) join->thd->alloc(sizeof(TABLE**)*(table_count*2)); + table_vector=(TABLE**) join->thd->alloc(sizeof(TABLE*)*(table_count*2)); if (!stat || !stat_ref || !table_vector) DBUG_RETURN(1); // Eom /* purecov: inspected */ select=0; From 32344d869772c937b7331ff63317495e9a1b1e31 Mon Sep 17 00:00:00 2001 From: "heikki@donna.mysql.fi" <> Date: Fri, 11 May 2001 17:07:58 +0300 Subject: [PATCH 02/24] manual.texi Added a note on table defragmenting and a sentence on InnoDB speed --- Docs/manual.texi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Docs/manual.texi b/Docs/manual.texi index 57e8e1e6730..aa02bc7fd7c 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -24513,6 +24513,10 @@ non-locking read in @code{SELECTS}, which increases transaction concurrency. There is not need for lock escalation in InnoDB, because row level locks in InnoDB fit in very small space. +InnoDB has been designed for maximum performance when processing +large data volumes. Its CPU efficiency is probably not +matched by any other disk-based relational database engine. + Technically, InnoDB is a database backend placed under @strong{MySQL}. InnoDB has its own buffer pool for caching data and indexes in main memory. InnoDB stores its tables and indexes in a tablespace, which @@ -25399,6 +25403,21 @@ but remember that deleted rows can be physically removed only in a purge operation after they are no longer needed in transaction rollback or consistent read. +@subsubsection Defragmenting a table + +If there are random insertions or deletions +in the indexes of a table, the indexes +may become fragmented. By this we mean that the physical ordering +of the index pages on the disk is not close to the alphabetical ordering +of the records on the pages. It can speed up index scans if you +periodically use @code{mysqldump} to dump the table to +a text file, drop the table, and reload it from the dump. + +Note that if the insertions to and index are always ascending and +records are deleted only from the end, then the the file space management +algorithm of InnoDB guarantees that fragmentation in the index will +not occur. + @node Error handling, InnoDB restrictions, File space management, InnoDB @subsection Error handling From 01f43d7370c385edda0bb92be6b85813d46057ce Mon Sep 17 00:00:00 2001 From: "monty@work.mysql.com" <> Date: Fri, 11 May 2001 22:51:24 +0200 Subject: [PATCH 03/24] Fixes for MySQL-Max --- Build-tools/Do-compile | 89 +++++++++++++++++++++++++++++---------- Build-tools/Do-patch-file | 2 +- 2 files changed, 68 insertions(+), 23 deletions(-) diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 011ad9662de..3ef9ba614f9 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -3,22 +3,29 @@ use Getopt::Long; $opt_distribution=$opt_user=$opt_result=$opt_config_options=$opt_config_env=""; $opt_dbd_options=$opt_perl_options=$opt_suffix=""; -$opt_tmp=""; -$opt_help=$opt_Information=$opt_no_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=0; -GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i") || usage(); +$opt_tmp=$version_suffix=""; +$opt_help=$opt_Information=$opt_no_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=0; +$opt_innodb=$opt_bdb=0; + +GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution") || usage(); usage() if ($opt_help || $opt_Information); usage() if (!$opt_distribution); +if ($opt_innodb || $opt_bdb) +{ + $version_suffix="-max"; +} + chomp($host=`hostname`); $full_host_name=$host; -print "$host: Compiling MySQL at $host$suffix, stage: $opt_stage\n" if ($opt_debug); +print "$host: Compiling MySQL$version_suffix at $host$suffix, stage: $opt_stage\n" if ($opt_debug); $connect_option= ($opt_tcpip ? "--host=$host" : ""); $host =~ /^([^.-]*)/; $host=$1 . $opt_suffix; $email="$opt_user\@mysql.com"; $pwd = `pwd`; chomp($pwd); -$log="$pwd/Logs/$host.log"; +$log="$pwd/Logs/$host$version_suffix.log"; $opt_distribution =~ /(mysql-[^\/]*)\.tar/; $ver=$1; $gcc_version=which("gcc"); @@ -72,13 +79,16 @@ if ($opt_stage == 0) log_system("$host/bin/mysqladmin --no-defaults -u root -P 9306 -h $host -s shutdown"); log_system("$host/bin/mysqladmin --no-defaults -u root -P 9307 -h $host -s shutdown"); } - system("mkdir $host") if (! -d $host); + if (!$opt_use_old_distribution) + { + system("mkdir $host") if (! -d $host); + system("touch $host/mysql-fix-for-glob"); + rm_all(<$host/mysql-*>); + system("mkdir $host/bin") if (! -d "$host/bin"); + } system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir); - system("touch $host/mysql-fix-for-glob"); - rm_all(<$host/mysql-*>); rm_all("$host/test"); system("mkdir $host/test") if (! -d "$host/test"); - system("mkdir $host/bin") if (! -d "$host/bin"); system("mkdir Logs") if (! -d "Logs"); system("mv $log ${log}-old") if (-f $log); unlink($log); @@ -91,15 +101,16 @@ select STDOUT; $|=1; safe_cd("$host"); -if ($opt_stage == 0) +if ($opt_stage == 0 && ! $opt_use_old_distribution) { safe_system("gunzip < $opt_distribution | $tar xf -"); } safe_cd($ver); if ($opt_stage <= 1) -{ +{ $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory); unlink("config.cache"); + log_system("$make clean") if ($opt_use_old_distribution); if ($opt_static_server) { $opt_config_options.=" --with-mysqld-ldflags=-all-static"; @@ -109,7 +120,15 @@ if ($opt_stage <= 1) $opt_config_options.=" --with-client-ldflags=-all-static"; } $opt_config_options.= " --disable-shared"; # Default for binary versions - check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL binary\" --with-extra-charsets=complex $opt_config_options","Thank you for choosing MySQL"); + if ($opt_bdb) + { + $opt_config_options.= " --with-berkeley-db" + } + if ($opt_innodb) + { + $opt_config_options.= " --with-innodb" + } + check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$version_suffix\" $opt_config_options","Thank you for choosing MySQL"); if (-d "$pwd/$host/include-mysql") { safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); @@ -118,7 +137,7 @@ if ($opt_stage <= 1) if ($opt_stage <= 2) { - unlink($opt_distribution) if (!$opt_no_delete); + unlink($opt_distribution) if (!$opt_no_delete && !$opt_use_old_distribution); safe_system("$make"); } @@ -140,19 +159,21 @@ if ($opt_stage <= 3) # Unpack and test the binary distrubtion # +$tar_file=<$pwd/$host/*.tar.gz>; +if (!defined($tar_file)) +{ + $tar_file=<$pwd/$host/*.tgz>; +} if ($opt_stage <= 4 && !$opt_no_test) { rm_all(<$pwd/$host/test/*>); safe_cd("$pwd/$host/test"); - $tar_file=<$pwd/$host/*.tar.gz>; - if (!defined($tar_file)) - { - $tar_file=<$pwd/$host/*.tgz>; - } safe_system("gunzip < $tar_file | $tar xf -"); } -$test_dir=<$pwd/$host/test/$ver-*>; +$tar_file =~ /(mysql-[^\/]*)\.tar/; +$ver=$1; +$test_dir="$pwd/$host/test/$ver"; if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) { @@ -164,12 +185,22 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) if ($opt_stage <= 6 && !$opt_no_test) { + my $extra; safe_cd($test_dir); log_system("./bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown") || info("There was no mysqld running\n"); sleep(2); log_system("rm -f ./data/mysql/*"); check_system("scripts/mysql_install_db --no-defaults --skip-locking","https://order"); - safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking >> $log 2>&1 &"); + $extra=""; + if ($opt_bdb) + { + $extra.=" -O bdb_cache_size=16M"; + } + if ($opt_innodb) + { + $extra.=" --innodb_data_file_path=ibdata1:100M"; + } + safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking $extra >> $log 2>&1 &"); sleep(2); } @@ -219,6 +250,14 @@ if ($opt_stage <= 9 && !$opt_no_test) log_system("rm -f output/*"); $tmp= $opt_fast_benchmark ? "--fast --user root --small-test" : ""; check_system("perl ./run-all-tests --log --die-on-errors $connect_option $tmp","RUN-mysql"); + if ($opt_bdb) + { + check_system("perl ./run-all-tests --log --suffix=\"_bdb\" --die-on-errors $connect_option $tmp --create-option=\"type=bdb\"","RUN-mysql"); + } + if ($opt_innodb) + { + check_system("perl ./run-all-tests --log --suffix=\"_innodb\" --die-on-errors $connect_option $tmp --create-option=\"type=innodb\"","RUN-mysql"); + } } if ($opt_stage <= 10 && $opt_result) @@ -240,16 +279,22 @@ exit 0; sub usage { print < Date: Sat, 12 May 2001 01:00:46 +0300 Subject: [PATCH 04/24] cleanup --- Docs/manual.texi | 179 ++++++++++++++++++++++++--------------- innobase/pars/pars0grm.c | 3 +- mysys/mf_keycache.c | 12 +-- sql-bench/crash-me.sh | 2 +- sql/mysqld.cc | 16 ++++ sql/sql_select.cc | 3 +- 6 files changed, 138 insertions(+), 77 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 57e8e1e6730..321f5a9c1e5 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -514,13 +514,13 @@ MyISAM Table Formats BDB or Berkeley_DB Tables -* BDB overview:: -* BDB install:: -* BDB start:: -* BDB characteristic:: -* BDB TODO:: -* BDB portability:: -* BDB errors:: +* BDB overview:: Overview of BDB Tables +* BDB install:: Installing BDB +* BDB start:: BDB startup options +* BDB characteristic:: Some characteristic of @code{BDB} tables: +* BDB TODO:: Some things we need to fix for BDB in the near future: +* BDB portability:: Operating systems supported by @strong{BDB} +* BDB errors:: Errors You May Get When Using BDB Tables GEMINI Tables @@ -533,7 +533,7 @@ InnoDB Tables * InnoDB overview:: InnoDB tables overview * InnoDB start:: InnoDB startup options -* Creating an InnoDB database:: Creating an InnoDB database. +* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. * Using InnoDB tables:: Creating InnoDB tables * Adding and removing:: Adding and removing InnoDB data and log files * Backing up:: Backing up and recovering an InnoDB database @@ -544,7 +544,7 @@ InnoDB Tables * File space management:: File space management and disk i/o * Error handling:: Error handling * InnoDB restrictions:: Some restrictions on InnoDB tables -* InnoDB contact information:: InnoDB contact information. +* InnoDB contact information:: InnoDB contact information. MySQL Tutorial @@ -1088,6 +1088,7 @@ Debugging a MySQL server * Compiling for debugging:: * Making trace files:: +* Using gdb on mysqld:: * Using stack trace:: * Using log files:: * Reproducable test case:: @@ -7395,7 +7396,7 @@ This will avoid problems with the @code{libstdc++} library and with C++ exceptions. If this doesn't help, you should compile a debug version and run -it with a trace file or under @code{gdb}. @xref{Debugging server}. +it with a trace file or under @code{gdb}. @xref{Using gdb on mysqld}. @node SunOS, Linux, Solaris x86, Source install system issues @subsection SunOS 4 Notes @@ -8888,11 +8889,10 @@ If @code{mysqld} doesn't start, please check whether or not the try to start it with @code{mysqld --standalone}; In this case you may get some useful information on the screen that may help solve this. -The last option is to start @code{mysqld} with @code{--debug}. In this -case @code{mysqld} will write a log file in @file{\mysqld.trace} -that should contain the reason why @code{mysqld} doesn't start. If you -make a bug report about this, please only send the lines to the mailing list -where something seems to go wrong! +The last option is to start @code{mysqld} with @code{--standalone +--debug}. In this case @code{mysqld} will write a log file in +@file{C:\mysqld.trace} that should contain the reason why @code{mysqld} +doesn't start. @xref{Making trace files}. @node NT start, Windows running, Win95 start, Windows @subsection Starting MySQL on NT or Windows 2000 @@ -8974,6 +8974,7 @@ C:\mysql\bin\mysqld --standalone --debug @end example The last version gives you a debug trace in @file{C:\mysqld.trace}. +@xref{Making trace files}. @node Windows running, Windows and SSH, NT start, Windows @subsection Running MySQL on Windows @@ -9999,15 +10000,8 @@ this: This problem occurs only on systems that don't have a working thread library and for which @strong{MySQL} must be configured to use MIT-pthreads. -On Windows, you can try to start @code{mysqld} as follows: - -@example -C:\mysql\bin\mysqld --standalone --debug -@end example - -This will not run in the background and it should also write a trace in -@file{\mysqld.trace}, which may help you determine the source of your -problems. @xref{Windows}. +If you can't get mysqld to start you can try to make a trace file +to find the problem. @xref{Making trace files}. If you are using BDB (Berkeley DB) tables, you should familiarize yourself with the different BDB specific startup options. @xref{BDB start}. @@ -10140,7 +10134,7 @@ Set the default table type for tables. @xref{Table types}. @item --debug[...]= If @strong{MySQL} is configured with @code{--with-debug}, you can use this option to get a trace file of what @code{mysqld} is doing. -@xref{The DBUG package}. +@xref{Making trace files}. @item --delay-key-write-for-all-tables Don't flush key buffers between writes for any @code{MyISAM} table. @@ -13810,7 +13804,7 @@ it down and restarting it. If everything else fails, start the @code{mysqld} daemon with a debugging option (for example, @code{--debug=d,general,query}). This will print host and user information about attempted connections, as well as information about -each command issued. @xref{Debugging server}. +each command issued. @xref{Making trace files}. @item If you have any other problems with the @strong{MySQL} grant tables and @@ -24471,7 +24465,7 @@ NuSphere is working on removing these limitations. @menu * InnoDB overview:: InnoDB tables overview * InnoDB start:: InnoDB startup options -* Creating an InnoDB database:: Creating an InnoDB database. +* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. * Using InnoDB tables:: Creating InnoDB tables * Adding and removing:: Adding and removing InnoDB data and log files * Backing up:: Backing up and recovering an InnoDB database @@ -31700,7 +31694,7 @@ the following configure options: @multitable @columnfractions .3 .7 @item @strong{Option} @tab @strong{Comment} -@item --with-server-suffix=-Max @tab Add a suffix to the @code{mysqld} version string. +@item --with-server-suffix=-max @tab Add a suffix to the @code{mysqld} version string. @item --with-bdb @tab Support for Berkeley DB (BDB) tables @item --with-innodb @tab Support for InnoDB tables. @item CFLAGS=-DUSE_SYMDIR @tab Symbolic links support for Windows. @@ -36105,6 +36099,7 @@ Try the following: @enumerate @item Start @code{mysqld} from @code{gdb} (or in another debugger). +@xref{Using gdb on mysqld}. @item Run your test scripts. @@ -37928,6 +37923,20 @@ file name is given, it defaults to the name of the host machine followed by @code{-bin}. If file name is given, but it doesn't contain a path, the file is written in the data directory. +You can use the following options to @code{mysqld} to affect what is logged +to the binary log: + +@multitable @columnfractions .4 .6 +@item @code{binlog-do-db=database_name} @tab +Tells the master it should log updates for the specified database, and +exclude all others not explicitly mentioned. +(Example: @code{binlog-do-db=some_database}) + +@item @code{binlog-ignore-db=database_name} @tab +Tells the master that updates to the given database should not be logged +to the binary log (Example: @code{binlog-ignore-db=some_database}) +@end multitable + To the binary log filename @code{mysqld} will append an extension that is a number that is incremented each time you execute @code{mysqladmin refresh}, execute @code{mysqladmin flush-logs}, execute the @code{FLUSH LOGS} @@ -38264,7 +38273,7 @@ greater detail in the next section. @multitable @columnfractions .3 .7 @item @strong{mysql_affected_rows()} @tab -Returns the number of rows affected by the last @code{UPDATE}, +Returns the number of rows changed/deleted/inserted by the last @code{UPDATE}, @code{DELETE}, or @code{INSERT} query. @item @strong{mysql_close()} @tab @@ -38452,7 +38461,7 @@ expects a counted string. If the string contains binary data (which may include null bytes), you must use @code{mysql_real_query()}. For each non-@code{SELECT} query (for example, @code{INSERT}, @code{UPDATE}, -@code{DELETE}), you can find out how many rows were affected (changed) +@code{DELETE}), you can find out how many rows were changed (affected) by calling @code{mysql_affected_rows()}. For @code{SELECT} queries, you retrieve the selected rows as a result set. @@ -38628,19 +38637,19 @@ A string representation of the error may be obtained by calling @subsubheading Description -Returns the number of rows affected (changed) by the last @code{UPDATE}, -@code{DELETE} or @code{INSERT} query. May be called immediately after -@code{mysql_query()} for @code{UPDATE}, @code{DELETE}, or @code{INSERT} -statements. For @code{SELECT} statements, @code{mysql_affected_rows()} -works like @code{mysql_num_rows()}. - -@code{mysql_affected_rows()} is currently implemented as a macro. +Returns the number of rows changed by the last @code{UPDATE}, deleted by +the last @code{DELETE} or inserted by the last @code{INSERT} +statement. May be called immediately after @code{mysql_query()} for +@code{UPDATE}, @code{DELETE}, or @code{INSERT} statements. For +@code{SELECT} statements, @code{mysql_affected_rows()} works like +@code{mysql_num_rows()}. @subsubheading Return Values An integer greater than zero indicates the number of rows affected or -retrieved. Zero indicates that no records matched the @code{WHERE} clause in -the query or that no query has yet been executed. -1 indicates that the +retrieved. Zero indicates that no records where updated for an +@code{UPDATE} statement, no rows matched the @code{WHERE} clause in the +query or that no query has yet been executed. -1 indicates that the query returned an error or that, for a @code{SELECT} query, @code{mysql_affected_rows()} was called prior to calling @code{mysql_store_result()}. @@ -38653,9 +38662,18 @@ None. @example mysql_query(&mysql,"UPDATE products SET cost=cost*1.25 WHERE group=10"); -printf("%d products updated",mysql_affected_rows(&mysql)); +printf("%ld products updated",(long) mysql_affected_rows(&mysql)); @end example +If one specifies the flag @code{CLIENT_FOUND_ROWS} when connecting to +@code{mysqld}, @code{mysql_affected_rows()} will return the number of +rows matched by the @code{WHERE} statement for @code{UPDATE} statements. + +Note that when one uses a @code{REPLACE} command, +@code{mysql_affected_rows()} will return 2 if the new row replaced and +old row. This is because in this case one row was inserted and then the +duplicate was deleted. + @findex @code{mysql_close()} @node mysql_close, mysql_connect, mysql_affected_rows, C API functions @subsubsection @code{mysql_close()} @@ -40471,6 +40489,12 @@ You must call @code{mysql_store_result()} or @code{mysql_use_result()} for every query that successfully retrieves data (@code{SELECT}, @code{SHOW}, @code{DESCRIBE}, @code{EXPLAIN}). +You don't have to call @code{mysql_store_result()} or +@code{mysql_use_result()} for other queries, but it will not do any +harm or cause any notable performance if you call @code{mysql_store_result()} +in all cases. You can detect if the query didn't have a result set by +checking if @code{mysql_store_result()} returns 0 (more about this later one). + If you want to know if the query should return a result set or not, you can use @code{mysql_field_count()} to check for this. @xref{mysql_field_count, @code{mysql_field_count}}. @@ -42222,7 +42246,6 @@ with the @code{--gdb} and @code{--debug} options to @code{mysql-test-run}. If you have not compiled @strong{MySQL} for debugging you should probably do that. Just specify the @code{--with-debug} options to @code{configure}! @xref{Installing source}. - @end itemize @page @@ -44238,8 +44261,8 @@ as root. Fixed bug when thread creation failed (could happen when doing a LOT of connections in a short time). @item -Don't free the key cache on @code{FLUSH TABLES} as this will cause problems -with temporary tables. +Fixed some problems with @code{FLUSH TABLES} and @code{TEMPORARY} tables. +(Problem with freeing the key cache and error @code{Can't reopen table...}). @item Fixed a problem in Innobase with other character sets than @code{latin1} and another problem when using many columns. @@ -49906,6 +49929,7 @@ problems that may be unique to your environment. @menu * Compiling for debugging:: * Making trace files:: +* Using gdb on mysqld:: * Using stack trace:: * Using log files:: * Reproducable test case:: @@ -49920,7 +49944,7 @@ If you have some very specific problem, you can always try to debug whether or not @strong{MySQL} was compiled with debugging by doing: @code{mysqld --help}. If the @code{--debug} flag is listed with the options then you have debugging enabled. @code{mysqladmin ver} also -lists the @code{mysqld} version as @code{mysql ... -debug} in this case. +lists the @code{mysqld} version as @code{mysql ... --debug} in this case. If you are using gcc or egcs, the recommended configure line is: @@ -49959,22 +49983,50 @@ send mail to @email{mysql@@lists.mysql.com} and ask for help. Please use the @code{mysqlbug} script for all bug reports or questions regarding the @strong{MySQL} version you are using! -@node Making trace files, Using stack trace, Compiling for debugging, Debugging server -@appendixsubsec Creating trace files and using gdb on mysqld +In the windows @strong{MySQL} distribution @code{mysqld.exe} is by +default compiled with support for trace files. -If you can cause the @code{mysqld} server to crash quickly, you can try to -create a trace file of this: +@node Making trace files, Using gdb on mysqld, Compiling for debugging, Debugging server +@appendixsubsec Creating trace files -Start the @code{mysqld} server with a trace log in @file{/tmp/mysqld.trace}. -The log file will get very @emph{BIG}. +If the @code{mysqld} server doesn't start or if you can cause the +@code{mysqld} server to crash quickly, you can try to create a trace +file to find the problem. -@code{mysqld --debug --log} +To do this you have to have a @code{mysqld} that is compiled for debugging. +You can check this by executing @code{mysqld -V}. If the version number +ends with @code{-debug}, it's compiled with support for trace files. -or you can start it with +Start the @code{mysqld} server with a trace log in @file{/tmp/mysqld.trace} +(or @file{C:\mysqld.trace} on windows): -@code{mysqld --debug=d,info,error,query,general,where:O,/tmp/mysql.trace} +@code{mysqld --debug} -which only prints information with the most interesting tags. +On Windows you should also use the @code{--standalone} flag to not start +@code{mysqld} as a service. + +Note that the trace file will get very @emph{BIG}! + +If you want to have a smaller trace file, you can use something like: + +@code{mysqld --debug=d,info,error,query,general,where:O,/tmp/mysqld.trace} + +which only prints information with the most interesting tags in +@file{/tmp/mysqld.trace}. + +If you make a bug report about this, please only send the lines from the +trace file to the appropriate mailing list where something seems to go +wrong! If you can't locate the wrong place, you can ftp the trace file, +together with a full bug report, to +@uref{ftp://support.mysql.com/pub/mysql/secret} so that a @strong{MySQL} +developer can take a look a this. + +The trace file is made with the @strong{DBUG} package by Fred Fish. +@xref{The DBUG package}. + +@cindex gdb, using +@node Using gdb on mysqld, Using stack trace, Making trace files, Debugging server +@appendixsubsec Debugging mysqld under gdb On most system you can also start @code{mysqld} from @code{gdb} to get more information if @code{mysqld} crashes. @@ -49990,7 +50042,7 @@ It's very hard to debug @strong{MySQL} under @code{gdb} if you do a lot of new connections the whole time as @code{gdb} doesn't free the memory for old threads. You can avoid this problem by starting @code{mysqld} with @code{-O thread_cache_size= 'max_connections +1'}. In most cases just -using @code{-O thread_cache_size= 5'} will help a lot! +using @code{-O thread_cache_size=5'} will help a lot! If you want to get a core dump on Linux if @code{mysqld} dies with a SIGSEGV signal, you can start mysqld with the @code{--core-file} option. @@ -49999,8 +50051,7 @@ find out why @code{mysqld} died: @example shell> gdb mysqld core -gdb> backtrace -gdb> info local +gdb> backtrace full gdb> exit @end example @@ -50032,15 +50083,7 @@ Here is an example how to debug mysqld: shell> gdb /usr/local/libexec/mysqld gdb> run ... -back # Do this when mysqld crashes -info locals -up -info locals -up -... -(until you get some information about local variables) - -quit +backtrace full # Do this when mysqld crashes @end example Include the above output in a mail generated with @code{mysqlbug} and @@ -50063,7 +50106,7 @@ debugging information by using the @code{trace} method or by setting the @code{DBI_TRACE} environment variable. @xref{Perl DBI Class, , Perl @code{DBI} Class}. -@node Using stack trace, Using log files, Making trace files, Debugging server +@node Using stack trace, Using log files, Using gdb on mysqld, Debugging server @appendixsubsec Using a stack trace On some operating systems, the error log will contain a stack trace if @@ -50278,7 +50321,7 @@ A very common mistake is to use an old @file{mysql.h} file from an old The @strong{MySQL} server and most @strong{MySQL} clients are compiled with the DBUG package originally made by Fred Fish. When one has configured @strong{MySQL} for debugging, this package makes it possible to get a trace -file of what the program is debugging. +file of what the program is debugging. @xref{Making trace files}. One uses the debug package by invoking the program with the @code{--debug="..."} or the @code{-#...} option. diff --git a/innobase/pars/pars0grm.c b/innobase/pars/pars0grm.c index 7f629a8fe4c..e06cba4e69d 100644 --- a/innobase/pars/pars0grm.c +++ b/innobase/pars/pars0grm.c @@ -95,9 +95,10 @@ /* The value of the semantic attribute is a pointer to a query tree node que_node_t */ #define YYSTYPE que_node_t* -#define alloca mem_alloc #include "univ.i" +#undef alloca +#define alloca mem_alloc #include #include "pars0pars.h" #include "mem0mem.h" diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index da02ec3da18..71177c4328b 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -327,7 +327,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length, } #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("exec",test_key_cache("start of key_cache_write",1);); + DBUG_EXECUTE("check_keycache",test_key_cache("start of key_cache_write",1);); #endif if (_my_disk_blocks > 0) { /* We have key_cacheing */ @@ -367,7 +367,7 @@ int key_cache_write(File file, my_off_t filepos, byte *buff, uint length, } end: #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("exec",test_key_cache("end of key_cache_write",1);); + DBUG_EXECUTE("check_keycache",test_key_cache("end of key_cache_write",1);); #endif return(error); } /* key_cache_write */ @@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) reg1 SEC_LINK *next,**start; #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("exec",test_key_cache("start of find_key_block",0);); + DBUG_EXECUTE("check_keycache",test_key_cache("start of find_key_block",0);); #endif *error=0; @@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) } _my_used_last=next; #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("exec",test_key_cache("end of find_key_block",0);); + DBUG_EXECUTE("check_keycache",test_key_cache("end of find_key_block",0);); #endif return next; } /* find_key_block */ @@ -529,7 +529,7 @@ int flush_key_blocks(File file, enum flush_type type) pthread_mutex_lock(&THR_LOCK_keycache); #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("exec",test_key_cache("start of flush_key_blocks",0);); + DBUG_EXECUTE("check_keycache",test_key_cache("start of flush_key_blocks",0);); #endif cache=cache_buff; /* If no key cache */ if (_my_disk_blocks > 0 && @@ -607,7 +607,7 @@ int flush_key_blocks(File file, enum flush_type type) } } #ifndef DBUG_OFF - DBUG_EXECUTE("exec",test_key_cache("end of flush_key_blocks",0);); + DBUG_EXECUTE("check_keycache",test_key_cache("end of flush_key_blocks",0);); #endif pthread_mutex_unlock(&THR_LOCK_keycache); if (cache != cache_buff) diff --git a/sql-bench/crash-me.sh b/sql-bench/crash-me.sh index 014962b1c6d..badbcc85288 100644 --- a/sql-bench/crash-me.sh +++ b/sql-bench/crash-me.sh @@ -1,4 +1,4 @@ -#!@PERL@ -w +#!@PERL@ # Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB # # This library is free software; you can redistribute it and/or diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7c4b88d0170..e252920d36e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -152,6 +152,22 @@ static uint handler_count; static bool opt_console=0,start_mode=0; #endif +/* Set prefix for windows binary */ +#ifdef __WIN__ +#undef MYSQL_SERVER_SUFFIX +#ifdef __NT__ +#if defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB) +#define MYSQL_SERVER_SUFFIX "-max-nt" +#else +#define MYSQL_SERVER_SUFFIX "-nt" +#endif /* ...DB */ +#elif defined(HAVE_INNOBASE_DB) || defined(HAVE_BERKELEY_DB) +#define MYSQL_SERVER_SUFFIX "-max" +#else +#define MYSQL_SERVER_SUFFIX "" +#endif /* __NT__ */ +#endif + #ifdef HAVE_BERKELEY_DB SHOW_COMP_OPTION have_berkeley_db=SHOW_OPTION_YES; #else diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 95a87e06f2b..641ce5b3d64 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5371,7 +5371,8 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field, ulong offset, Item *having) { handler *file=table->file; - char *org_record,*new_record, *record; + char *org_record,*new_record; + byte *record; int error; ulong reclength=table->reclength-offset; DBUG_ENTER("remove_dup_with_compare"); From a4289cc0c8208098c7cb0602c368237bb53cb1a7 Mon Sep 17 00:00:00 2001 From: "monty@donna.mysql.fi" <> Date: Sat, 12 May 2001 09:24:35 +0300 Subject: [PATCH 05/24] Added information about using mysql-max --- Docs/manual.texi | 72 ++++++++++++++++++++++++++++------ sql/mysqld.cc | 26 ++++++------ support-files/my-huge.cnf.sh | 2 +- support-files/my-large.cnf.sh | 2 +- support-files/my-medium.cnf.sh | 2 +- support-files/my-small.cnf.sh | 2 +- 6 files changed, 78 insertions(+), 28 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 2ede3648a9b..b3023a905c7 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -6001,9 +6001,15 @@ shell> scripts/mysql_install_db shell> chown -R root /usr/local/mysql shell> chown -R mysql /usr/local/mysql/var shell> chgrp -R mysql /usr/local/mysql +shell> cp support-files/my-medium.cnf /etc/my.cnf shell> /usr/local/mysql/bin/safe_mysqld --user=mysql & @end example +If you want have support for InnoDB tables, you should edit the +@code{/etc/my.cnf} file and remove the @code{#} character before the +parameters that starts with @code{innodb_...}. @xref{Option +files}. @xref{InnoDB start}. + If you start from a source RPM, then do the following: @example @@ -8816,7 +8822,7 @@ This is also described in the @file{README} file that comes with the @subsection Installing MySQL on Windows If you don't have a copy of the @strong{MySQL} distribution, you should -first download one from @uref{http://www.mysql.com/}. +first download one from @uref{http://www.mysql.com/downloads/mysql-3.23.html}. If you plan to connect to @strong{MySQL} from some other program, you will probably also need the @strong{MyODBC} driver. You can find this at the @@ -8843,6 +8849,36 @@ specify all paths with @samp{/} instead of @samp{\}. If you use @samp{\}, you need to specify this twice, as @samp{\} is the escape character in @strong{MySQL}. @xref{Option files}. +Starting from @strong{MySQL} 3.23.38 the windows distribution includes +both the normal and the @strong{MySQL-Max} binaries. The main benefit +of using the normal @code{mysqld.exe} binary is that it's a little +faster and uses less resources. + +Here is a list of the different @strong{MySQL} servers you can use: + +@multitable @columnfractions .25 .75 +@item @code{mysqld} @tab +Compiled with full debugging and automatic memory allocation checking, +symbolic links, BDB and InnoDB tables. +@item @code{mysqld-opt} @tab +Optimized binary with no support for transactional tables. +@item @code{mysqld-nt} @tab +Optimized for a Pentium pro processor. Has support for +named pipes. One can run this version on Win98, but in +this case no named pipes are created and one must +have TCP/IP installed. +@item mysqld-max @tab +Optimized binary with support for symbolic links, BDB and InnoDB tables. +@item mysqld-max-nt @tab +Like mysqld-max, but compiled with support for named pipes. +@end multitable + +All of the above binaries are optimized for the Pentium pro processor but +should work on any Intel processor >= i386. + +NOTE: If you want to use InnoDB tables, you need to specify some startup +options in your my.ini file! @xref{InnoDB start}. + @node Win95 start, NT start, Windows installation, Windows @subsection Starting MySQL on Windows 95 or Windows 98 @@ -8857,15 +8893,6 @@ Winsock 2! You can get the newest Winsock from @uref{http://www.microsoft.com/}. Win98 has the new Winsock 2 library, so the above doesn't apply for Win98. -There are 2 different @strong{MySQL} servers you can use: - -@multitable @columnfractions .25 .75 -@item @code{mysqld} @tab Compiled with full debugging and automatic memory allocation checking -@item @code{mysqld-opt} @tab Optimized for a Pentium processor. -@end multitable - -Both of the above should work on any Intel processor >= i386. - To start the @code{mysqld} server, you should start an MS-DOS window and type: @example @@ -8911,10 +8938,15 @@ should install @strong{MySQL} as a service on NT/Win2000: @example C:\mysql\bin\mysqld-nt --install + +or + +C:\mysql\bin\mysqld-max-nt --install @end example -(You could use the @code{mysqld} or @code{mysqld-opt} servers on NT, -but those cannot be started as a service or use named pipes.) +(You can also use @code{mysqld} binaries that doesn't end with +@code{-nt.exe} on NT, but those cannot be started as a service or use +named pipes.) You can start and stop the @strong{MySQL} service with: @@ -9863,6 +9895,10 @@ reload the grant tables. @cindex server, starting problems @cindex problems, starting the server +If you are going to use tables that support transactions (BDB, InnoDB or +Gemini), you should first create a my.cnf file and set startup options +for the table types you plan to use. @xref{Table types}. + Generally, you start the @code{mysqld} server in one of three ways: @itemize @bullet @@ -23353,6 +23389,9 @@ type it should use for the table. @strong{MySQL} will always create a @code{.frm} file to hold the table and column definitions. Depending on the table type, the index and data will be stored in other files. +Note that to use @code{InnoDB} tables you have to use at least +the @code{innodb_data_file_path} startup option. @xref{InnoDB start}. + The default table type in @strong{MySQL} is @code{MyISAM}. If you are trying to use a table type that is not compiled-in or activated, @strong{MySQL} will instead create a table of type @code{MyISAM}. This @@ -31719,6 +31758,14 @@ the following configure options: @item CFLAGS=-DUSE_SYMDIR @tab Symbolic links support for Windows. @end multitable +You can find the @strong{MySQL}-max binaries at +@uref{http://www.mysql.com/downloads/mysql-max-3.23.html}. + +The windows @strong{MySQL} 3.23 binary distribution includes both the +standard @strong{mysqld.exe} binary and the @code{mysqld-max.exe} binary. +@uref{http://www.mysql.com/downloads/mysql-3.23.html}. +@xref{Windows installation}. + Note that as Berkeley DB and InnoDB are not available for all platforms, some of the @code{Max} binaries may not have support for both of these. You can check which table types are supported by doing the following @@ -31780,6 +31827,7 @@ binaries includes: @item Solaris-sparc @tab Y @tab Y @item SCO OSR5 @tab Y @tab Y @item UnixWare @tab Y @tab Y +@item Windows/NT @tab Y @tab Y @end multitable @cindex tools, safe_mysqld diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3c64f0573e2..503a45a8da0 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1127,7 +1127,7 @@ static void start_signal_handler(void) #ifdef HAVE_LINUXTHREADS static sig_handler write_core(int sig); -#if defined (__i386__) || defined(__alpha__) +#if defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)) #define LINUX_STACK_TRACE #endif @@ -1158,11 +1158,13 @@ inline __volatile__ void print_str(const char* name, #ifdef LINUX_STACK_TRACE #define SIGRETURN_FRAME_COUNT 1 -#ifdef __alpha__ -// The only way to backtrace without a symbol table on alpha -// to find stq fp,N(sp), and the first byte -// of the instruction opcode will give us the value of N. From this -// we can find where the old value of fp is stored +#if defined(__alpha__) && defined(__GNUC__) +/* + The only way to backtrace without a symbol table on alpha + is to find stq fp,N(sp), and the first byte + of the instruction opcode will give us the value of N. From this + we can find where the old value of fp is stored +*/ #define MAX_INSTR_IN_FUNC 10000 @@ -1221,7 +1223,7 @@ terribly wrong...\n"); return; } #endif -#ifdef __alpha__ +#if defined(__alpha__) && defined(__GNUC__) __asm __volatile__ ("mov $15,%0" :"=r"(fp) :"r"(fp)); @@ -1231,7 +1233,7 @@ terribly wrong...\n"); -fomit-frame-pointer? Aborting backtrace!\n"); return; } -#endif +#endif /* __alpha__ */ if (!thd) { @@ -1252,7 +1254,7 @@ terribly wrong...\n"); } fprintf(stderr, "Stack range sanity check OK, backtrace follows:\n"); -#ifdef __alpha__ +#if defined(__alpha__) && defined(__GNUC__) fprintf(stderr, "Warning: Alpha stacks are difficult -\ will be taking some wild guesses, stack trace may be incorrect or \ terminate abruptly\n"); @@ -1261,7 +1263,7 @@ terribly wrong...\n"); __asm __volatile__ ("bsr %0, do_next; do_next: " :"=r"(pc) :"r"(pc)); -#endif +#endif /* __alpha__ */ while (fp < stack_bottom) { @@ -1270,7 +1272,7 @@ terribly wrong...\n"); fprintf(stderr, "%p\n", frame_count == SIGRETURN_FRAME_COUNT ? *(fp+17) : *(fp+1)); #endif -#ifdef __alpha__ +#if defined(__alpha__) && defined(__GNUC__) uchar** new_fp = find_prev_fp(pc, fp); if(frame_count == SIGRETURN_FRAME_COUNT - 1) { @@ -1291,7 +1293,7 @@ terribly wrong...\n"); } else { - fprintf(stderr, "Not smart enough to deal with the rest of \ + fprintf(stderr, "Not smart enough to deal with the rest of\ this stack\n"); goto print_glob_vars; } diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 7917ab9d9f1..103a6c16cfd 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -47,10 +47,10 @@ server-id = 1 #set-variable = bdb_max_lock=100000 # Uncomment the following if you are using Innobase tables +#innodb_data_file_path = ibdata1:2000M;ibdata2:2000M #innodb_data_home_dir = @localstatedir@/ #innodb_log_group_home_dir = @localstatedir@/ #innodb_log_arch_dir = @localstatedir@/ -#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M #set-variable = innodb_mirrored_log_groups=1 #set-variable = innodb_log_files_in_group=3 #set-variable = innodb_log_file_size=5M diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index d4e28c14019..f314566c5fb 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -43,10 +43,10 @@ server-id = 1 #set-variable = bdb_max_lock=100000 # Uncomment the following if you are using Innobase tables +#innodb_data_file_path = ibdata1:1000M #innodb_data_home_dir = @localstatedir@/ #innodb_log_group_home_dir = @localstatedir@/ #innodb_log_arch_dir = @localstatedir@/ -#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M #set-variable = innodb_mirrored_log_groups=1 #set-variable = innodb_log_files_in_group=3 #set-variable = innodb_log_file_size=5M diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index d25345502e2..675241b25dd 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -45,10 +45,10 @@ server-id = 1 #set-variable = bdb_max_lock=10000 # Uncomment the following if you are using Innobase tables +#innodb_data_file_path = ibdata1:400M #innodb_data_home_dir = @localstatedir@/ #innodb_log_group_home_dir = @localstatedir@/ #innodb_log_arch_dir = @localstatedir@/ -#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M #set-variable = innodb_mirrored_log_groups=1 #set-variable = innodb_log_files_in_group=3 #set-variable = innodb_log_file_size=5M diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index 6cafa8281fe..cad0e10e684 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -42,10 +42,10 @@ server-id = 1 #skip-bdb # Uncomment the following if you are using Innobase tables +#innodb_data_file_path = ibdata1:100M #innodb_data_home_dir = @localstatedir@/ #innodb_log_group_home_dir = @localstatedir@/ #innodb_log_arch_dir = @localstatedir@/ -#innodb_data_file_path = ibdata1:25M;ibdata2:37M;ibdata3:100M;ibdata4:300M #set-variable = innodb_mirrored_log_groups=1 #set-variable = innodb_log_files_in_group=3 #set-variable = innodb_log_file_size=5M From 6f9878b155e0a6d50ec955e2017b4b7496c157de Mon Sep 17 00:00:00 2001 From: "paul@central.snake.net" <> Date: Sat, 12 May 2001 22:03:04 -0500 Subject: [PATCH 06/24] manual.texi changed location of samp_db distribution and MySQL manual.texi book errata. --- Docs/manual.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index b3023a905c7..e5ef4d71be0 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -1592,9 +1592,9 @@ contributing to the development of @strong{MySQL}. @item Pages @tab 800 @item Price @tab $49.99 US @item Downloadable examples @tab - @uref{http://www.mysql.com/Downloads/Contrib/Examples/samp_db.tar.gz, @code{samp_db.tar.gz}} + @uref{http://www.kitebird.com/mysql-book/, @code{samp_db} distribution} @item Errata @tab - @uref{http://www.mysql.com/documentation/pauls-mysql-book-errata.html, are available here} + @uref{http://www.kitebird.com/mysql-book/errata.html, are available here} @end multitable Foreword by Michael ``Monty'' Widenius, @strong{MySQL} Moderator. From 329382c1e5065fa06554eee17479bb303869dcda Mon Sep 17 00:00:00 2001 From: "monty@donna.mysql.fi" <> Date: Mon, 14 May 2001 01:12:40 +0300 Subject: [PATCH 07/24] Cleanup up stacktrace code Updated qsort source from glibc. Add debugging of keycache when EXTRA_DEBUG is specified --- Docs/manual.texi | 11 +- bdb/dist/Makefile.in | 3 + mysys/mf_keycache.c | 2 +- mysys/mf_qsort.c | 233 ++++++++++++++++------------------ sql/Makefile.am | 15 ++- sql/mysqld.cc | 292 +++++++------------------------------------ sql/stacktrace.c | 215 +++++++++++++++++++++++++++++++ sql/stacktrace.h | 51 ++++++++ 8 files changed, 444 insertions(+), 378 deletions(-) create mode 100644 sql/stacktrace.c create mode 100644 sql/stacktrace.h diff --git a/Docs/manual.texi b/Docs/manual.texi index b3023a905c7..e1bf4045e1a 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -43451,18 +43451,23 @@ your actual @strong{MySQL} server either way. Free of charge. See Created by Laurent Bossavit of NetDIVE. @strong{NOTE:} Doesn't work with Access2! -@item @uref{http://www.mysql.com/Downloads/Contrib/msql2mysqlWrapper-1.0.tgz, /msql2mysqlWrapper 1.0} +@item @uref{http://www.mysql.com/Downloads/Contrib/mdb2sql.bas, mdb2sql.bas} +Converter from Access97 to @strong{MySQL} by Moshe Gurvich. + +@item @uref{http://www.mysql.com/Downloads/Contrib/msql2mysqlWrapper-1.0.tgz, msql2mysqlWrapper 1.0} A C wrapper from @code{mSQL} to @strong{MySQL}. By @email{alfred@@sb.net} @item @uref{http://www.mysql.com/Downloads/Contrib/sqlconv.pl, sqlconv.pl} -A simple script that can be used to copy fields from one @strong{MySQL} table to -another in bulk. Basically, you can run @code{mysqldump} and pipe it to +A simple script that can be used to copy fields from one @strong{MySQL} table +to another in bulk. Basically, you can run @code{mysqldump} and pipe it to the @code{sqlconv.pl} script. The script will parse through the @code{mysqldump} output and will rearrange the fields so they can be inserted into a new table. An example is when you want to create a new 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. @end itemize @appendixsec Using MySQL with Other Products diff --git a/bdb/dist/Makefile.in b/bdb/dist/Makefile.in index 73f82cd5648..4a47953e3e1 100644 --- a/bdb/dist/Makefile.in +++ b/bdb/dist/Makefile.in @@ -997,3 +997,6 @@ strerror@o@: $(srcdir)/clib/strerror.c $(CC) $(CFLAGS) $? vsnprintf@o@: $(srcdir)/clib/vsnprintf.c $(CC) $(CFLAGS) $? + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 71177c4328b..d63ddbf3702 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -232,7 +232,7 @@ static inline void link_file_to_changed(SEC_LINK *next) } -#ifndef DBUG_OFF +#if !defined(DBUG_OFF) && !defined(EXTRA_DEBUG) #define DBUG_OFF /* This should work */ #endif diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c index e029e148ddb..7074abac96e 100644 --- a/mysys/mf_qsort.c +++ b/mysys/mf_qsort.c @@ -1,40 +1,28 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, +/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Written by Douglas C. Schmidt (schmidt@ics.uci.edu). + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - + You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -/* Plug-compatible replacement for UNIX qsort. - Copyright (C) 1989 Free Software Foundation, Inc. - Written by Douglas C. Schmidt (schmidt@ics.uci.edu) - Optimized and modyfied for mysys by monty. - -This file is part of GNU CC. - -GNU QSORT is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) -any later version. - -GNU QSORT is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU QSORT; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* + Modifications by monty: + - Uses mysys include files + - Small fixes to make the it a bit faster + - Can be compiled with a cmp function that takes one extra argument. +*/ #include "mysys_priv.h" @@ -46,31 +34,35 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif /* Byte-wise swap two items of size SIZE. */ -#define SWAP(A,B,SIZE) do {int sz=(int)(SIZE); char *a = (A); char *b = (B); \ - do { char _temp = *a;*a++ = *b;*b++ = _temp;} while (--sz);} while (0) - -/* Copy SIZE bytes from item B to item A. */ -#define COPY(A,B,SIZE) {int sz = (int) (SIZE); do { *(A)++ = *(B)++; } while (--sz); } - -/* This should be replaced by a standard ANSI macro. */ -#define BYTES_PER_WORD 8 - -/* The next 4 #defines implement a very fast in-line stack abstraction. */ -#define STACK_SIZE (BYTES_PER_WORD * sizeof (long)) -#define PUSH(LOW,HIGH) do {top->lo = LOW;top++->hi = HIGH;} while (0) -#define POP(LOW,HIGH) do {LOW = (--top)->lo;HIGH = top->hi;} while (0) -#define STACK_NOT_EMPTY (stack < top) +#define SWAP(a, b, size) \ + do \ + { \ + register size_t __size = (size); \ + register char *__a = (a), *__b = (b); \ + do \ + { \ + char __tmp = *__a; \ + *__a++ = *__b; \ + *__b++ = __tmp; \ + } while (--__size > 0); \ + } while (0) /* Discontinue quicksort algorithm when partition gets below this size. - This particular magic number was chosen to work best on a Sparc SLC. */ -#define MAX_THRESH 12 + This particular magic number was chosen to work best on a Sun 4/260. */ +#define MAX_THRESH 8 /* Stack node declarations used to store unfulfilled partition obligations. */ typedef struct -{ - char *lo; - char *hi; -} stack_node; + { + char *lo; + char *hi; + } stack_node; + +/* The next 4 #defines implement a very fast in-line stack abstraction. */ +#define STACK_SIZE (8 * sizeof(unsigned long int)) +#define PUSH(LOW,HIGH) do {top->lo = LOW;top++->hi = HIGH;} while (0) +#define POP(LOW,HIGH) do {LOW = (--top)->lo;HIGH = top->hi;} while (0) +#define STACK_NOT_EMPTY (stack < top) /* Order size using quicksort. This implementation incorporates four optimizations discussed in Sedgewick: @@ -88,7 +80,7 @@ typedef struct 3. Only quicksorts TOTAL_ELEMS / MAX_THRESH partitions, leaving insertion sort to order the MAX_THRESH items within each partition. This is a big win, since insertion sort is faster for small, mostly - sorted array segements. + sorted array segments. 4. The larger of the two sub-partitions is always pushed onto the stack first, with the algorithm then concentrating on the @@ -111,100 +103,98 @@ qsort_t qsort(void *base_ptr, size_t total_elems, size_t size, qsort_cmp cmp) /* Allocating SIZE bytes for a pivot buffer facilitates a better algorithm below since we can do comparisons directly on the pivot. */ - int max_thresh = (int) (MAX_THRESH * size); + size_t max_thresh = (size_t) (MAX_THRESH * size); if (total_elems <= 1) SORT_RETURN; /* Crashes on MSDOS if continues */ if (total_elems > MAX_THRESH) { char *lo = base_ptr; - char *hi = lo + size * (total_elems - 1); + char *hi = &lo[size * (total_elems - 1)]; stack_node stack[STACK_SIZE]; /* Largest size needed for 32-bit int!!! */ stack_node *top = stack + 1; - char *pivot_buffer = (char *) my_alloca ((int) size); + char *pivot = (char *) my_alloca ((int) size); #ifdef HAVE_purify stack[0].lo=stack[0].hi=0; #endif - while (STACK_NOT_EMPTY) + do { - char *left_ptr; - char *right_ptr; + char *left_ptr,*right_ptr; + + /* Select median value from among LO, MID, and HI. Rearrange + LO and HI so the three values are sorted. This lowers the + probability of picking a pathological pivot value and + skips a comparison for both the LEFT_PTR and RIGHT_PTR. */ + + char *mid = lo + size * (((ulong) (hi - lo) / (ulong) size) >> 1); + + if (CMP(hi,lo) < 0) + SWAP (hi, lo, size); + if (CMP (mid, lo) < 0) + SWAP (mid, lo, size); + else if (CMP (hi, mid) < 0) + SWAP (mid, hi, size); + memcpy (pivot, mid, size); + + left_ptr = lo + size; + right_ptr = hi - size; + + /* Here's the famous ``collapse the walls'' section of quicksort. + Gotta like those tight inner loops! They are the main reason + that this algorithm runs much faster than others. */ + do { - char *pivot = pivot_buffer; + while (CMP (left_ptr, pivot) < 0) + left_ptr += size; + + while (CMP (pivot, right_ptr) < 0) + right_ptr -= size; + + if (left_ptr < right_ptr) { - /* Select median value from among LO, MID, and HI. Rearrange - LO and HI so the three values are sorted. This lowers the - probability of picking a pathological pivot value and - skips a comparison for both the LEFT_PTR and RIGHT_PTR. */ - - char *mid = lo + size * (((uint) (hi - lo) / (uint) size) >> 1); - - if (CMP(hi,lo) < 0) - SWAP (hi, lo, size); - if (CMP (mid, lo) < 0) - SWAP (mid, lo, size); - else if (CMP (hi, mid) < 0) - SWAP (mid, hi, size); - COPY (pivot, mid, size); - pivot = pivot_buffer; + SWAP (left_ptr, right_ptr, size); + left_ptr += size; + right_ptr -= size; } - left_ptr = lo + size; - right_ptr = hi - size; - - /* Here's the famous ``collapse the walls'' section of quicksort. - Gotta like those tight inner loops! They are the main reason - that this algorithm runs much faster than others. */ - do + else if (left_ptr == right_ptr) { - while (CMP (left_ptr, pivot) < 0) - left_ptr += size; - - while (CMP (pivot, right_ptr) < 0) - right_ptr -= size; - - if (left_ptr < right_ptr) - { - SWAP (left_ptr, right_ptr, size); - left_ptr += size; - right_ptr -= size; - } - else if (left_ptr == right_ptr) - { - left_ptr += size; - right_ptr -= size; - break; - } + left_ptr += size; + right_ptr -= size; + break; } - while (left_ptr <= right_ptr); + else + break; /* left_ptr > right_ptr */ } + while (left_ptr <= right_ptr); + /* Set up pointers for next iteration. First determine whether left and right partitions are below the threshold size. If so, ignore one or both. Otherwise, push the larger partition's bounds on the stack and continue sorting the smaller one. */ - if ((right_ptr - lo) <= max_thresh) + if ((size_t) (right_ptr - lo) <= max_thresh) { - if ((hi - left_ptr) <= max_thresh) /* Ignore both small parts. */ - POP (lo, hi); - else /* Ignore small left part. */ - lo = left_ptr; + if ((size_t) (hi - left_ptr) <= max_thresh) + POP (lo, hi); /* Ignore both small partitions. */ + else + lo = left_ptr; /* Ignore small left part. */ } - else if ((hi - left_ptr) <= max_thresh) /* Ignore small right part. */ - hi = right_ptr; - else if ((right_ptr - lo) > (hi - left_ptr)) /* Push larger left part */ + else if ((size_t) (hi - left_ptr) <= max_thresh) + hi = right_ptr; /* Ignore small right partition. */ + else if ((right_ptr - lo) > (hi - left_ptr)) { - PUSH (lo, right_ptr); + PUSH (lo, right_ptr); /* Push larger left part */ lo = left_ptr; } - else /* Push larger right part */ + else { - PUSH (left_ptr, hi); + PUSH (left_ptr, hi); /* Push larger right part */ hi = right_ptr; } - } - my_afree(pivot_buffer); + } while (STACK_NOT_EMPTY); + my_afree(pivot); } /* Once the BASE_PTR array is partially sorted by quicksort the rest @@ -215,9 +205,9 @@ qsort_t qsort(void *base_ptr, size_t total_elems, size_t size, qsort_cmp cmp) { char *end_ptr = (char*) base_ptr + size * (total_elems - 1); - char *run_ptr; char *tmp_ptr = (char*) base_ptr; char *thresh = min (end_ptr, (char*) base_ptr + max_thresh); + register char *run_ptr; /* Find smallest element in first threshold and place it at the array's beginning. This is the smallest array element, @@ -230,18 +220,18 @@ qsort_t qsort(void *base_ptr, size_t total_elems, size_t size, qsort_cmp cmp) if (tmp_ptr != (char*) base_ptr) SWAP (tmp_ptr, (char*) base_ptr, size); - /* Insertion sort, running from left-hand-side up to `right-hand-side.' - Pretty much straight out of the original GNU qsort routine. */ + /* Insertion sort, running from left-hand-side up to right-hand-side. */ for (run_ptr = (char*) base_ptr + size; - (tmp_ptr = run_ptr += size) <= end_ptr; ) + (run_ptr += size) <= end_ptr; ) { - while (CMP (run_ptr, tmp_ptr -= size) < 0) ; - - if ((tmp_ptr += size) != run_ptr) + if (CMP (run_ptr, (tmp_ptr = run_ptr-size)) < 0) { char *trav; + while (CMP (run_ptr, tmp_ptr -= size) < 0) ; + tmp_ptr += size; + /* Shift down all smaller elements, put found element in 'run_ptr' */ for (trav = run_ptr + size; --trav >= run_ptr;) { char c = *trav; @@ -252,7 +242,6 @@ qsort_t qsort(void *base_ptr, size_t total_elems, size_t size, qsort_cmp cmp) *hi = c; } } - } } SORT_RETURN; diff --git a/sql/Makefile.am b/sql/Makefile.am index 596a1d3acf7..774ef06f17c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -54,7 +54,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ ha_gemini.h opt_range.h opt_ft.h \ sql_select.h structs.h table.h sql_udf.h hash_filo.h\ lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \ - log_event.h mini_client.h sql_repl.h slave.h + log_event.h mini_client.h sql_repl.h slave.h \ + stacktrace.h mysqld_SOURCES = sql_lex.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ @@ -67,17 +68,19 @@ mysqld_SOURCES = sql_lex.cc \ sql_base.cc table.cc sql_select.cc sql_insert.cc \ sql_update.cc sql_delete.cc \ procedure.cc item_uniq.cc sql_test.cc \ - log.cc init.cc derror.cc sql_acl.cc unireg.cc \ + log.cc log_event.cc init.cc derror.cc sql_acl.cc \ + unireg.cc \ time.cc opt_range.cc opt_sum.cc opt_ft.cc \ records.cc filesort.cc handler.cc \ - ha_isam.cc ha_isammrg.cc ha_heap.cc \ - ha_myisam.cc ha_myisammrg.cc ha_berkeley.cc \ - ha_innobase.cc ha_gemini.cc \ + ha_heap.cc ha_myisam.cc ha_myisammrg.cc \ + ha_berkeley.cc ha_innobase.cc ha_gemini.cc \ + ha_isam.cc ha_isammrg.cc \ sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \ slave.cc sql_repl.cc \ - md5.c log_event.cc mini_client.cc mini_client_errors.c + mini_client.cc mini_client_errors.c \ + md5.c stacktrace.c gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) mysqlbinlog_SOURCES = mysqlbinlog.cc mini_client.cc net_serv.cc \ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 503a45a8da0..c9e19b65a6c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -20,6 +20,7 @@ #include #include "sql_acl.h" #include "slave.h" +#include "stacktrace.h" #ifdef HAVE_BERKELEY_DB #include "ha_berkeley.h" #endif @@ -1124,237 +1125,34 @@ static void start_signal_handler(void) #else /* if ! __WIN__ && ! __EMX__ */ -#ifdef HAVE_LINUXTHREADS -static sig_handler write_core(int sig); - -#if defined (__i386__) || (defined(__alpha__) && defined(__GNUC__)) -#define LINUX_STACK_TRACE -#endif - -#ifdef LINUX_STACK_TRACE -#define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) - -extern char* __bss_start; -static char* heap_start, *heap_end; - -inline __volatile__ void print_str(const char* name, - const char* val, int max_len) -{ - fprintf(stderr, "%s at %p ", name, val); - if(!PTR_SANE(val)) - { - fprintf(stderr, " is invalid pointer\n"); - return; - } - - fprintf(stderr, "= "); - for(; max_len && PTR_SANE(val) && *val; --max_len) - fputc(*val++, stderr); - fputc('\n', stderr); -} -#endif - - -#ifdef LINUX_STACK_TRACE -#define SIGRETURN_FRAME_COUNT 1 - -#if defined(__alpha__) && defined(__GNUC__) -/* - The only way to backtrace without a symbol table on alpha - is to find stq fp,N(sp), and the first byte - of the instruction opcode will give us the value of N. From this - we can find where the old value of fp is stored -*/ - -#define MAX_INSTR_IN_FUNC 10000 - -inline uchar** find_prev_fp(uint32* pc, uchar** fp) -{ - int i; - for(i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc) - { - uchar* p = (uchar*)pc; - if(p[2] == 222 && p[3] == 35) - { - return (uchar**)((uchar*)fp - *(short int*)p); - } - } - return 0; -} - -inline uint32* find_prev_pc(uint32* pc, uchar** fp) -{ - int i; - for(i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc) - { - char* p = (char*)pc; - if(p[1] == 0 && p[2] == 94 && p[3] == -73) - { - uint32* prev_pc = (uint32*)*((fp+p[0]/sizeof(fp))); - return prev_pc; - } - } - return 0; -} - -#endif - -inline __volatile__ void trace_stack() -{ - uchar **stack_bottom; - uchar** fp; - LINT_INIT(fp); - LINT_INIT(stack_bottom); - - fprintf(stderr, -"Attempting backtrace. You can use the following information to find out\n\ -where mysqld died. If you see no messages after this, something went\n\ -terribly wrong...\n"); - THD* thd = current_thd; - uint frame_count = 0; -#ifdef __i386__ - __asm __volatile__ ("movl %%ebp,%0" - :"=r"(fp) - :"r"(fp)); - if (!fp) - { - fprintf(stderr, "frame pointer (ebp) is NULL, did you compile with\n\ --fomit-frame-pointer? Aborting backtrace!\n"); - return; - } -#endif -#if defined(__alpha__) && defined(__GNUC__) - __asm __volatile__ ("mov $15,%0" - :"=r"(fp) - :"r"(fp)); - if (!fp) - { - fprintf(stderr, "frame pointer (fp) is NULL, did you compile with\n\ --fomit-frame-pointer? Aborting backtrace!\n"); - return; - } -#endif /* __alpha__ */ - - if (!thd) - { - fprintf(stderr, "Cannot determine thread, fp=%p, backtrace may not be correct.\n", fp); - /* Assume that the stack starts at the previous even 65K */ - ulong tmp= min(0x10000,thread_stack); - stack_bottom= (uchar**) (((ulong) &stack_bottom + tmp) & - ~(ulong) 0xFFFF); - } - else - stack_bottom = (uchar**) thd->thread_stack; - if (fp > stack_bottom || fp < stack_bottom - thread_stack) - { - fprintf(stderr, "Bogus stack limit or frame pointer,\ - fp=%p, stack_bottom=%p, thread_stack=%ld, aborting backtrace.\n", - fp, stack_bottom, thread_stack); - return; - } - - fprintf(stderr, "Stack range sanity check OK, backtrace follows:\n"); -#if defined(__alpha__) && defined(__GNUC__) - fprintf(stderr, "Warning: Alpha stacks are difficult -\ - will be taking some wild guesses, stack trace may be incorrect or \ - terminate abruptly\n"); - // On Alpha, we need to get pc - uint32* pc; - __asm __volatile__ ("bsr %0, do_next; do_next: " - :"=r"(pc) - :"r"(pc)); -#endif /* __alpha__ */ - - while (fp < stack_bottom) - { -#ifdef __i386__ - uchar** new_fp = (uchar**)*fp; - fprintf(stderr, "%p\n", frame_count == SIGRETURN_FRAME_COUNT ? - *(fp+17) : *(fp+1)); -#endif -#if defined(__alpha__) && defined(__GNUC__) - uchar** new_fp = find_prev_fp(pc, fp); - if(frame_count == SIGRETURN_FRAME_COUNT - 1) - { - new_fp += 90; - } - - if(fp && pc) - { - pc = find_prev_pc(pc, fp); - if(pc) - fprintf(stderr, "%p\n", pc); - else - { - fprintf(stderr, "Not smart enough to deal with the rest\ - of this stack\n"); - goto print_glob_vars; - } - } - else - { - fprintf(stderr, "Not smart enough to deal with the rest of\ - this stack\n"); - goto print_glob_vars; - } -#endif - if (new_fp <= fp ) - { - fprintf(stderr, "New value of fp=%p failed sanity check,\ - terminating stack trace!\n", new_fp); - goto print_glob_vars; - } - fp = new_fp; - ++frame_count; - } - - fprintf(stderr, "Stack trace seems successful - bottom reached\n"); - - print_glob_vars: - fprintf(stderr, "Please read http://www.mysql.com/doc/U/s/Using_stack_trace.html and follow instructions on how to resolve the stack trace. Resolved\n\ -stack trace is much more helpful in diagnosing the problem, so please do \n\ -resolve it\n"); - fprintf(stderr, "Trying to get some variables.\n\ -Some pointers may be invalid and cause the dump to abort...\n"); - heap_end = (char*)sbrk(0); - print_str("thd->query", thd->query, 1024); - fprintf(stderr, "thd->thread_id = %ld\n", thd->thread_id); - fprintf(stderr, "Successfully dumped variables, if you ran with --log,\n\ -take a look at the details of what thread %ld did to cause the crash.\n\ -In some cases of really bad corruption, this value may be invalid\n", - thd->thread_id); - fprintf(stderr, "Please use the information above to create a repeatable\n\ -test case for the crash, and send it to bugs@lists.mysql.com\n"); -} -#endif -#endif - #ifdef HAVE_LINUXTHREADS #define UNSAFE_DEFAULT_LINUX_THREADS 200 #endif static sig_handler handle_segfault(int sig) { + THD *thd=current_thd; // strictly speaking, one needs a mutex here // but since we have got SIGSEGV already, things are a mess // so not having the mutex is not as bad as possibly using a buggy // mutex - so we keep things simple if (segfaulted) - { - fprintf(stderr, "Fatal signal %d while backtracing\n", sig); - exit(1); - } + { + fprintf(stderr, "Fatal signal %d while backtracing\n", sig); + exit(1); + } segfaulted = 1; fprintf(stderr,"\ mysqld got signal %d;\n\ -This could be because you hit a bug. It is also possible that \n\ -this binary or one of the libraries it was linked agaist is \n\ -corrupt, improperly built, or misconfigured. This error can also be\n\ -caused by malfunctioning hardware.", sig); - fprintf(stderr, "We will try our best to scrape up some info\n\ -that will hopefully help diagnose the problem, but since we have already\n\ -crashed, something is definitely wrong and this may fail\n"); +This could be because you hit a bug. It is also possible that this binary\n\ +or one of the libraries it was linked agaist is corrupt, improperly built,\n\ +or misconfigured. This error can also be caused by malfunctioning hardware.\n", + sig); + fprintf(stderr, "\ +We will try our best to scrape up some info that will hopefully help diagnose\n\ +the problem, but since we have already crashed, something is definitely wrong\n\ +and this may fail\n\n"); fprintf(stderr, "key_buffer_size=%ld\n", keybuff_size); fprintf(stderr, "record_buffer=%ld\n", my_default_record_cache_size); fprintf(stderr, "sort_buffer=%ld\n", sortbuff_size); @@ -1365,42 +1163,47 @@ crashed, something is definitely wrong and this may fail\n"); key_buffer_size + (record_buffer + sort_buffer)*max_connections = %ld K\n\ bytes of memory\n", (keybuff_size + (my_default_record_cache_size + sortbuff_size) * max_connections)/ 1024); - fprintf(stderr, "Hope that's ok, if not, decrease some variables in the\n\ -equation\n"); + fprintf(stderr, "Hope that's ok, if not, decrease some variables in the equation\n\n"); #if defined(HAVE_LINUXTHREADS) + if (sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS) + { + fprintf(stderr, "\ +You seem to be running 32-bit Linux and have %d concurrent connections.\n\ +If you have not changed STACK_SIZE in LinuxThreads and build the binary \n\ +yourself, LinuxThreads is quite likely to steal a part of global heap for\n\ +the thread stack. Please read http://www.mysql.com/doc/L/i/Linux.html\n\n", + thread_count); + } +#endif /* HAVE_LINUXTHREADS */ - if(sizeof(char*) == 4 && thread_count > UNSAFE_DEFAULT_LINUX_THREADS) - { - fprintf(stderr, "You seem to be running 32-bit Linux and\n\ - have %d concurrent connections. If you have not\n\ -changed STACK_SIZE in LinuxThreads and build the binary yourself,\n\ -LinuxThreads is quite likely to steal a part of global heap for a \n\ -thread stack. Please read http://www.mysql.com/doc/L/i/Linux.html\n", - thread_count); - } -#ifdef LINUX_STACK_TRACE +#ifdef HAVE_STACKTRACE if(!(test_flags & TEST_NO_STACKTRACE)) - trace_stack(); + print_stacktrace(thd ? (gptr) thd->thread_stack : (gptr) 0, + thread_stack); + if (thd) + { + fprintf(stderr, "Trying to get some variables.\n\ +Some pointers may be invalid and cause the dump to abort...\n"); + safe_print_str("thd->query", thd->query, 1024); + fprintf(stderr, "thd->thread_id=%ld\n", thd->thread_id); + fprintf(stderr, "\n +Successfully dumped variables, if you ran with --log, take a look at the\n\ +details of what thread %ld did to cause the crash. In some cases of really\n\ +bad corruption, the above values may be invalid\n\n", + thd->thread_id); + } + fprintf(stderr, "\ +Please use the information above to create a repeatable test case for the\n\ +crash, and send it to bugs@lists.mysql.com\n"); fflush(stderr); -#endif /* LINUX_STACK_TRACE */ +#endif /* HAVE_STACKTRACE */ + if (test_flags & TEST_CORE_ON_SIGNAL) write_core(sig); -#endif /* HAVE_LINUXTHREADS */ exit(1); } -/* Produce a core for the thread */ - -#ifdef HAVE_LINUXTHREADS -static sig_handler write_core(int sig) -{ - signal(sig, SIG_DFL); - if (fork() != 0) exit(1); // Abort main program - // Core will be written at exit -} -#endif - static void init_signals(void) { @@ -1413,12 +1216,9 @@ static void init_signals(void) sigemptyset(&sa.sa_mask); sigprocmask(SIG_SETMASK,&sa.sa_mask,NULL); -#ifdef LINUX_STACK_TRACE - heap_start = (char*)&__bss_start; -#endif - if (!(test_flags & TEST_NO_STACKTRACE) || (test_flags & TEST_CORE_ON_SIGNAL)) { + init_stacktrace(); sa.sa_handler=handle_segfault; sigaction(SIGSEGV, &sa, NULL); #ifdef SIGBUS diff --git a/sql/stacktrace.c b/sql/stacktrace.c new file mode 100644 index 00000000000..ba5bc9d2e85 --- /dev/null +++ b/sql/stacktrace.c @@ -0,0 +1,215 @@ +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#include +#include "stacktrace.h" +#include + +#ifdef HAVE_STACKTRACE +#include + +#define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) + +char *heap_start; + +void safe_print_str(const char* name, const char* val, int max_len) +{ + char *heap_end= (char*) sbrk(0); + fprintf(stderr, "%s at %p ", name, val); + + if (!PTR_SANE(val)) + { + fprintf(stderr, " is invalid pointer\n"); + return; + } + + fprintf(stderr, "= "); + for(; max_len && PTR_SANE(val) && *val; --max_len) + fputc(*val++, stderr); + fputc('\n', stderr); +} + +#ifdef HAVE_LINUXTHREADS +#define SIGRETURN_FRAME_COUNT 1 + +#if defined(__alpha__) && defined(__GNUC__) +/* + The only way to backtrace without a symbol table on alpha + is to find stq fp,N(sp), and the first byte + of the instruction opcode will give us the value of N. From this + we can find where the old value of fp is stored +*/ + +#define MAX_INSTR_IN_FUNC 10000 + +inline uchar** find_prev_fp(uint32* pc, uchar** fp) +{ + int i; + for(i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc) + { + uchar* p = (uchar*)pc; + if (p[2] == 222 && p[3] == 35) + { + return (uchar**)((uchar*)fp - *(short int*)p); + } + } + return 0; +} + +inline uint32* find_prev_pc(uint32* pc, uchar** fp) +{ + int i; + for(i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc) + { + char* p = (char*)pc; + if (p[1] == 0 && p[2] == 94 && p[3] == -73) + { + uint32* prev_pc = (uint32*)*((fp+p[0]/sizeof(fp))); + return prev_pc; + } + } + return 0; +} +#endif /* defined(__alpha__) && defined(__GNUC__) */ + + +void print_stacktrace(gptr stack_bottom, ulong thread_stack) +{ + uchar** fp; + uint frame_count = 0; +#if defined(__alpha__) && defined(__GNUC__) + uint32* pc; +#endif + LINT_INIT(fp); + + fprintf(stderr,"\ +Attempting backtrace. You can use the following information to find out\n\ +where mysqld died. If you see no messages after this, something went\n\ +terribly wrong...\n"); +#ifdef __i386__ + __asm __volatile__ ("movl %%ebp,%0" + :"=r"(fp) + :"r"(fp)); + if (!fp) + { + fprintf(stderr, "frame pointer (ebp) is NULL, did you compile with\n\ +-fomit-frame-pointer? Aborting backtrace!\n"); + return; + } +#endif +#if defined(__alpha__) && defined(__GNUC__) + __asm __volatile__ ("mov $15,%0" + :"=r"(fp) + :"r"(fp)); + if (!fp) + { + fprintf(stderr, "frame pointer (fp) is NULL, did you compile with\n\ +-fomit-frame-pointer? Aborting backtrace!\n"); + return; + } +#endif /* __alpha__ */ + + if (!stack_bottom) + { + ulong tmp= min(0x10000,thread_stack); + /* Assume that the stack starts at the previous even 65K */ + stack_bottom= (gptr) (((ulong) &fp + tmp) & + ~(ulong) 0xFFFF); + fprintf(stderr, "Cannot determine thread, fp=%p, backtrace may not be correct.\n", fp); + } + if (fp > (uchar**) stack_bottom || + fp < (uchar**) stack_bottom - thread_stack) + { + fprintf(stderr, "Bogus stack limit or frame pointer,\ + fp=%p, stack_bottom=%p, thread_stack=%ld, aborting backtrace.\n", + fp, stack_bottom, thread_stack); + return; + } + + fprintf(stderr, "Stack range sanity check OK, backtrace follows:\n"); +#if defined(__alpha__) && defined(__GNUC__) + fprintf(stderr, "Warning: Alpha stacks are difficult -\ + will be taking some wild guesses, stack trace may be incorrect or \ + terminate abruptly\n"); + // On Alpha, we need to get pc + __asm __volatile__ ("bsr %0, do_next; do_next: " + :"=r"(pc) + :"r"(pc)); +#endif /* __alpha__ */ + + while (fp < (uchar**) stack_bottom) + { +#ifdef __i386__ + uchar** new_fp = (uchar**)*fp; + fprintf(stderr, "%p\n", frame_count == SIGRETURN_FRAME_COUNT ? + *(fp+17) : *(fp+1)); +#endif /* __386__ */ + +#if defined(__alpha__) && defined(__GNUC__) + uchar** new_fp = find_prev_fp(pc, fp); + if (frame_count == SIGRETURN_FRAME_COUNT - 1) + { + new_fp += 90; + } + + if (fp && pc) + { + pc = find_prev_pc(pc, fp); + if (pc) + fprintf(stderr, "%p\n", pc); + else + { + fprintf(stderr, "Not smart enough to deal with the rest\ + of this stack\n"); + goto end; + } + } + else + { + fprintf(stderr, "Not smart enough to deal with the rest of this stack\n"); + goto end; + } +#endif /* defined(__alpha__) && defined(__GNUC__) */ + if (new_fp <= fp ) + { + fprintf(stderr, "New value of fp=%p failed sanity check,\ + terminating stack trace!\n", new_fp); + goto end; + } + fp = new_fp; + ++frame_count; + } + + fprintf(stderr, "Stack trace seems successful - bottom reached\n"); + +end: + fprintf(stderr, "Please read http://www.mysql.com/doc/U/s/Using_stack_trace.html and follow instructions on how to resolve the stack trace. Resolved\n\ +stack trace is much more helpful in diagnosing the problem, so please do \n\ +resolve it\n"); +} +#endif /* HAVE_LINUXTHREADS */ +#endif /* HAVE_STACKTRACE */ + +/* Produce a core for the thread */ + +#ifdef HAVE_WRITE_CORE +void write_core(int sig) +{ + signal(sig, SIG_DFL); + if (fork() != 0) exit(1); // Abort main program + // Core will be written at exit +} +#endif /* HAVE_WRITE_CORE */ diff --git a/sql/stacktrace.h b/sql/stacktrace.h new file mode 100644 index 00000000000..b6c0ec43a0f --- /dev/null +++ b/sql/stacktrace.h @@ -0,0 +1,51 @@ +/* Copyright (C) 2000 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_LINUXTHREADS +#if defined(HAVE_STACKTRACE) || (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) +#undef HAVE_STACKTRACE +#define HAVE_STACKTRACE + +extern char* __bss_start; +extern char* heap_start; + +#define init_stacktrace() { heap_start = (char*) &__bss_start; } +void print_stacktrace(gptr stack_bottom, ulong thread_stack); +void safe_print_str(const char* name, const char* val, int max_len); +#endif /* (defined (__i386__) || (defined(__alpha__) && defined(__GNUC__))) */ + +#define HAVE_WRITE_CORE +void write_core(int sig); +#endif /* HAVE_LINUXTHREADS */ + +/* Define empty prototypes for functions that are not implemented */ +#ifndef HAVE_STACKTRACE +#define init_stacktrace() {} +#define print_stacktrace(A,B) {} +#define safe_print_str(A,B,C) {} +#endif /* HAVE_STACKTRACE */ + +#ifndef HAVE_WRITE_CORE +#define write_core(A) {} +#endif + +#ifdef __cplusplus +} +#endif From 0f24c9fcee654608462f38a423fae4407a539f70 Mon Sep 17 00:00:00 2001 From: "heikki@donna.mysql.fi" <> Date: Mon, 14 May 2001 17:45:38 +0300 Subject: [PATCH 08/24] os0file.c Use O_SYNC if possible, second choice fdatasync, and last choice fsync configure.in Check if fdatasync exists manual.texi Updated defragmenting doc manual.texi Corrected fillfactor contract threashold for a page to 1/2 --- Docs/manual.texi | 15 +++++++++++---- innobase/configure.in | 1 + innobase/os/os0file.c | 19 ++++++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 1ac5d2ee9a9..5a37604a4eb 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -25283,7 +25283,7 @@ of the index records. If index records are inserted in a sequential (ascending or descending) order, the resulting index pages will be about 15/16 full. If records are inserted in a random order, then the pages will be -1/2 - 15/16 full. If the fillfactor of an index page drops below 1/4, +1/2 - 15/16 full. If the fillfactor of an index page drops below 1/2, InnoDB will try to contract the index tree to free the page. @subsubsection Insert buffering @@ -25440,13 +25440,20 @@ consistent read. If there are random insertions or deletions in the indexes of a table, the indexes -may become fragmented. By this we mean that the physical ordering +may become fragmented. By fragmentation we mean that the physical ordering of the index pages on the disk is not close to the alphabetical ordering -of the records on the pages. It can speed up index scans if you +of the records on the pages, or that there are many unused pages in the +64-page blocks which were allocated to the index. + +It can speed up index scans if you periodically use @code{mysqldump} to dump the table to a text file, drop the table, and reload it from the dump. +Another way to do the defragmenting is to @code{ALTER} the table type to +@code{MyISAM} and back to @code{InnoDB} again. +Note that a @code{MyISAM} table must fit in a single file +on your operating system. -Note that if the insertions to and index are always ascending and +If the insertions to and index are always ascending and records are deleted only from the end, then the the file space management algorithm of InnoDB guarantees that fragmentation in the index will not occur. diff --git a/innobase/configure.in b/innobase/configure.in index 2ed456ff0b1..83d302c6dc4 100644 --- a/innobase/configure.in +++ b/innobase/configure.in @@ -37,6 +37,7 @@ AC_PROG_INSTALL AC_CHECK_HEADERS(aio.h sched.h) AC_CHECK_SIZEOF(int, 4) AC_CHECK_FUNCS(sched_yield) +AC_CHECK_FUNCS(fdatasync) #AC_C_INLINE Already checked in MySQL AC_C_BIGENDIAN diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index b3cb86a1178..065d9b6f553 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -299,6 +299,13 @@ try_again: UT_NOT_USED(purpose); + /* On Linux opening a file in the O_SYNC mode seems to be much + more efficient than calling an explicit fsync or fdatasync after + each write */ + +#ifdef O_SYNC + create_flag = create_flag | O_SYNC; +#endif if (create_mode == OS_FILE_CREATE) { file = open(name, create_flag, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); @@ -492,8 +499,18 @@ os_file_flush( #else int ret; - ret = fsync(file); +#ifdef O_SYNC + /* We open all files with the O_SYNC option, which means there + should be no need for fsync or fdatasync. In practice such a need + may be because on a Linux Xeon computer "donna" the OS seemed to be + fooled to believe that 500 disk writes/second are possible. */ + ret = 0; +#elif defined(HAVE_FDATASYNC) + ret = fdatasync(file); +#else + ret = fsync(file); +#endif if (ret == 0) { return(TRUE); } From eac8cbf6ddfc634167ac3a02d0fbffb7e9625e05 Mon Sep 17 00:00:00 2001 From: "heikki@donna.mysql.fi" <> Date: Mon, 14 May 2001 22:27:29 +0300 Subject: [PATCH 09/24] row0undo.c Fix a bug if we run out of space in the tablespace assertion in trx0roll.c --- innobase/row/row0undo.c | 1 - 1 file changed, 1 deletion(-) diff --git a/innobase/row/row0undo.c b/innobase/row/row0undo.c index 6dc032f7e13..10ac3af6de9 100644 --- a/innobase/row/row0undo.c +++ b/innobase/row/row0undo.c @@ -171,7 +171,6 @@ row_undo_search_clust_to_pcur( /* printf("--------------------undoing a previous version\n"); */ - trx_undo_rec_release(node->trx, node->undo_no); ret = FALSE; } else { From a37c82a5cf1360a1d97477c5abf9ff133a5f0ea8 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Mon, 14 May 2001 14:11:26 -0600 Subject: [PATCH 10/24] sql/stacktrace.c fixed frame depth since we now are a frame deeper on Alpha, use SP instead of FP --- sql/stacktrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/stacktrace.c b/sql/stacktrace.c index ba5bc9d2e85..ab1113f74cf 100644 --- a/sql/stacktrace.c +++ b/sql/stacktrace.c @@ -43,7 +43,7 @@ void safe_print_str(const char* name, const char* val, int max_len) } #ifdef HAVE_LINUXTHREADS -#define SIGRETURN_FRAME_COUNT 1 +#define SIGRETURN_FRAME_COUNT 2 #if defined(__alpha__) && defined(__GNUC__) /* @@ -111,7 +111,7 @@ terribly wrong...\n"); } #endif #if defined(__alpha__) && defined(__GNUC__) - __asm __volatile__ ("mov $15,%0" + __asm __volatile__ ("mov $30,%0" :"=r"(fp) :"r"(fp)); if (!fp) From 7ca3253d0a72b54d09ac7f66e06dbfd8a9ca3fb4 Mon Sep 17 00:00:00 2001 From: "tim@threads.polyesthetic.msg" <> Date: Mon, 14 May 2001 20:41:54 -0400 Subject: [PATCH 11/24] RPM .spec file: add "mysql" to the Provides: line, to match what Redhat's RPM's are looking for. Submitted by Florin Andrei . --- support-files/mysql.spec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ea09c4f8cc7..a10b09c12be 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -18,7 +18,7 @@ Icon: mysql.gif URL: http://www.mysql.com/ Packager: David Axmark Vendor: MySQL AB -Provides: msqlormysql MySQL-server +Provides: msqlormysql MySQL-server mysql Obsoletes: mysql # Think about what you use here since the first step is to From b48ed7db1b3b2b38c46c7e67b155e3e2b00c4897 Mon Sep 17 00:00:00 2001 From: "heikki@donna.mysql.fi" <> Date: Tue, 15 May 2001 19:53:35 +0300 Subject: [PATCH 12/24] os0file.c More precise error message number ut0dbg.h Changed Innobase->InnoDB os0file.c InnoDB prints now the number of OS error in a file operation --- innobase/include/ut0dbg.h | 6 +++--- innobase/os/os0file.c | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h index 751609b244e..657d1bf95b2 100644 --- a/innobase/include/ut0dbg.h +++ b/innobase/include/ut0dbg.h @@ -27,12 +27,12 @@ extern ulint* ut_dbg_null_ptr; \ if (!((ulint)(EXPR) + ut_dbg_zero)) {\ fprintf(stderr,\ - "Innobase: Assertion failure in thread %lu in file %s line %lu\n",\ + "InnoDB: Assertion failure in thread %lu in file %s line %lu\n",\ os_thread_get_curr_id(), IB__FILE__, (ulint)__LINE__);\ fprintf(stderr,\ - "Innobase: we intentionally generate a memory trap.\n");\ + "InnoDB: We intentionally generate a memory trap.\n");\ fprintf(stderr,\ - "Innobase: Send a bug report to mysql@lists.mysql.com\n");\ + "InnoDB: Send a detailed bug report to mysql@lists.mysql.com\n");\ ut_dbg_stop_threads = TRUE;\ dbg_i = *(ut_dbg_null_ptr);\ if (dbg_i) {\ diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 065d9b6f553..50e75c56c18 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -120,6 +120,10 @@ os_file_get_last_error(void) err = (ulint) GetLastError(); + fprintf(stderr, + "InnoDB: operating system error number %li in a file operation.\n", + (long) err); + if (err == ERROR_FILE_NOT_FOUND) { return(OS_FILE_NOT_FOUND); } else if (err == ERROR_DISK_FULL) { @@ -130,6 +134,10 @@ os_file_get_last_error(void) return(100 + err); } #else + fprintf(stderr, + "InnoDB: operating system error number %i in a file operation.\n", + errno); + err = (ulint) errno; if (err == ENOSPC ) { @@ -173,7 +181,7 @@ os_file_handle_error( "InnoDB: Encountered a problem with file %s.\n", name); } - fprintf(stderr, + fprintf(stderr, "InnoDB: Cannot continue operation.\n" "InnoDB: Disk is full. Try to clean the disk to free space.\n" "InnoDB: Delete possible created file and restart.\n"); @@ -184,7 +192,9 @@ os_file_handle_error( return(TRUE); } else { - ut_error; + fprintf(stderr, "InnoDB: Cannot continue operation.\n"); + + exit(1); } return(FALSE); From 228a4a85503699bd179c852c026cb33c7f965527 Mon Sep 17 00:00:00 2001 From: "heikki@donna.mysql.fi" <> Date: Wed, 16 May 2001 19:12:47 +0300 Subject: [PATCH 13/24] os0file.c Fixed an extraneous error message at the start of db, changed from O_SYNC back to fdatasync because extremely slow on Sun --- innobase/os/os0file.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/innobase/os/os0file.c b/innobase/os/os0file.c index 50e75c56c18..96f8f332066 100644 --- a/innobase/os/os0file.c +++ b/innobase/os/os0file.c @@ -120,9 +120,11 @@ os_file_get_last_error(void) err = (ulint) GetLastError(); - fprintf(stderr, + if (err != ERROR_FILE_EXISTS) { + fprintf(stderr, "InnoDB: operating system error number %li in a file operation.\n", (long) err); + } if (err == ERROR_FILE_NOT_FOUND) { return(OS_FILE_NOT_FOUND); @@ -134,11 +136,13 @@ os_file_get_last_error(void) return(100 + err); } #else - fprintf(stderr, + err = (ulint) errno; + + if (err != EEXIST) { + fprintf(stderr, "InnoDB: operating system error number %i in a file operation.\n", errno); - - err = (ulint) errno; + } if (err == ENOSPC ) { return(OS_FILE_DISK_FULL); @@ -310,12 +314,11 @@ try_again: UT_NOT_USED(purpose); /* On Linux opening a file in the O_SYNC mode seems to be much - more efficient than calling an explicit fsync or fdatasync after - each write */ + more efficient for small writes than calling an explicit fsync or + fdatasync after each write, but on Solaris O_SYNC and O_DSYNC is + extremely slow in large block writes to a big file. Therefore we + do not use these options, but use explicit fdatasync. */ -#ifdef O_SYNC - create_flag = create_flag | O_SYNC; -#endif if (create_mode == OS_FILE_CREATE) { file = open(name, create_flag, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); @@ -435,10 +438,13 @@ os_file_set_size( byte* buf; try_again: - buf = ut_malloc(UNIV_PAGE_SIZE * 64); + /* We use a very big 16 MB buffer in writing because Linux is + extremely slow in fdatasync on 1 MB writes */ + + buf = ut_malloc(UNIV_PAGE_SIZE * 1024); /* Write buffer full of zeros */ - for (i = 0; i < UNIV_PAGE_SIZE * 64; i++) { + for (i = 0; i < UNIV_PAGE_SIZE * 1024; i++) { buf[i] = '\0'; } @@ -450,10 +456,10 @@ try_again: UT_NOT_USED(size_high); #endif while (offset < low) { - if (low - offset < UNIV_PAGE_SIZE * 64) { + if (low - offset < UNIV_PAGE_SIZE * 1024) { n_bytes = low - offset; } else { - n_bytes = UNIV_PAGE_SIZE * 64; + n_bytes = UNIV_PAGE_SIZE * 1024; } ret = os_file_write(name, file, buf, offset, 0, n_bytes); @@ -469,6 +475,8 @@ try_again: ret = os_file_flush(file); + fsync(file); + if (ret) { return(TRUE); } @@ -509,14 +517,7 @@ os_file_flush( #else int ret; -#ifdef O_SYNC - /* We open all files with the O_SYNC option, which means there - should be no need for fsync or fdatasync. In practice such a need - may be because on a Linux Xeon computer "donna" the OS seemed to be - fooled to believe that 500 disk writes/second are possible. */ - - ret = 0; -#elif defined(HAVE_FDATASYNC) +#ifdef HAVE_FDATASYNC ret = fdatasync(file); #else ret = fsync(file); From 0b30f641da22ca3e36036430109074ddf80ad995 Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Wed, 16 May 2001 13:19:40 -0600 Subject: [PATCH 14/24] mysql-test/t/rpl000001.test added a test for updates on user table --- mysql-test/t/rpl000001.test | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 7989a679a70..99b5c3bfcae 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -71,10 +71,18 @@ connection master1; drop table t1; create table t1 (n int); insert into t1 values(3456); +use mysql; +insert into user (Host, User, Password) + VALUES ("10.10.10.%", "blafasel2", "blafasel2"); +select select_priv,user from mysql.user where user = 'blafasel2'; +update user set Select_priv = "Y" where User="blafasel2"; +select select_priv,user from mysql.user where user = 'blafasel2'; +use test; save_master_pos; connection slave; sync_with_master; select n from t1; +select select_priv,user from mysql.user where user = 'blafasel2'; connection master1; drop table t1; save_master_pos; From 37d58578e9fe6ebf630ea89b0ee08f3fdfa071de Mon Sep 17 00:00:00 2001 From: "sasha@mysql.sashanet.com" <> Date: Wed, 16 May 2001 13:21:49 -0600 Subject: [PATCH 15/24] mysql-test/r/rpl000001.result forgot to add result --- mysql-test/r/rpl000001.result | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index a80fb618457..ebccb1e1e6b 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -7,5 +7,11 @@ sum(length(word)) 0 count(*) 10 +select_priv user +N blafasel2 +select_priv user +Y blafasel2 n 3456 +select_priv user +Y blafasel2 From b6138af0009fd8f032ff223188198a95ce9ec42c Mon Sep 17 00:00:00 2001 From: "serg@serg.mysql.com" <> Date: Wed, 16 May 2001 23:06:30 +0200 Subject: [PATCH 16/24] Fulltext manual changed, MERGE bug fixed --- Docs/manual.texi | 117 ++++++++++++++++++++++++++------------ myisammrg/mymrgdef.h | 1 - myisammrg/myrg_rkey.c | 11 +--- myisammrg/myrg_rnext.c | 45 ++------------- myisammrg/myrg_rprev.c | 13 ++--- mysql-test/r/merge.result | 3 + mysql-test/t/merge.test | 13 +++++ 7 files changed, 106 insertions(+), 97 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 57e8e1e6730..a6e2de10cae 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -29233,42 +29233,36 @@ index. Full-text search is performed with the @code{MATCH} function. @example -mysql> CREATE TABLE t (a VARCHAR(200), b TEXT, FULLTEXT (a,b)); +mysql> CREATE TABLE articles ( + -> id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY, + -> title VARCHAR(200), + -> body TEXT, + -> FULLTEXT (title,body) + -> ); Query OK, 0 rows affected (0.00 sec) -mysql> INSERT INTO t VALUES - -> ('MySQL has now support', 'for full-text search'), - -> ('Full-text indexes', 'are called collections'), - -> ('Only MyISAM tables','support collections'), - -> ('Function MATCH ... AGAINST()','is used to do a search'), - -> ('Full-text search in MySQL', 'implements vector space model'); +mysql> INSERT INTO articles VALUES + -> (0,'MySQL Tutorial', 'DBMS stands for DataBase Management ...'), + -> (0,'How To Use MySQL Efficiently', 'After you went through a ...'), + -> (0,'Optimizing MySQL','In this tutorial we will show how to ...'), + -> (0,'1001 MySQL Trick','1. Never run mysqld as root. 2. Normalize ...'), + -> (0,'MySQL vs. YourSQL', 'In the following database comparison we ...'), + -> (0,'MySQL Security', 'When configured properly, MySQL could be ...'); Query OK, 5 rows affected (0.00 sec) Records: 5 Duplicates: 0 Warnings: 0 -mysql> SELECT * FROM t WHERE MATCH (a,b) AGAINST ('MySQL'); -+---------------------------+-------------------------------+ -| a | b | -+---------------------------+-------------------------------+ -| MySQL has now support | for full-text search | -| Full-text search in MySQL | implements vector-space-model | -+---------------------------+-------------------------------+ +mysql> SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('database'); ++----+-------------------+---------------------------------------------+ +| id | title | body | ++----+-------------------+---------------------------------------------+ +| 5 | MySQL vs. YourSQL | In the following database comparison we ... | +| 1 | MySQL Tutorial | DBMS stands for DataBase Management ... | ++----+-------------------+---------------------------------------------+ 2 rows in set (0.00 sec) - -mysql> SELECT *,MATCH a,b AGAINST ('collections support') as x FROM t; -+------------------------------+-------------------------------+--------+ -| a | b | x | -+------------------------------+-------------------------------+--------+ -| MySQL has now support | for full-text search | 0.3834 | -| Full-text indexes | are called collections | 0.3834 | -| Only MyISAM tables | support collections | 0.7668 | -| Function MATCH ... AGAINST() | is used to do a search | 0 | -| Full-text search in MySQL | implements vector space model | 0 | -+------------------------------+-------------------------------+--------+ -5 rows in set (0.00 sec) @end example The function @code{MATCH} matches a natural language query @code{AGAINST} -a text collection (which is simply the columns that are covered by a +a text collection (which is simply the set of columns covered by a @code{FULLTEXT} index). For every row in a table it returns relevance - a similarity measure between the text in that row (in the columns that are part of the collection) and the query. When it is used in a @code{WHERE} @@ -29279,10 +29273,51 @@ number of words in the row, the number of unique words in that row, the total number of words in the collection, and the number of documents (rows) that contain a particular word. -MySQL uses a very simple parser to split text into words. A ``word'' is -any sequence of letters, numbers, @samp{'}, and @samp{_}. Any ``word'' -that is present in the stopword list or just too short (3 characters -or less) is ignored. +The above is a basic example of using @code{MATCH} function. Rows are +returned with relevance decreasing. + +@example +mysql> SELECT id,MATCH (title,body) AGAINST ('Tutorial') FROM articles; ++----+-----------------------------------------+ +| id | MATCH (title,body) AGAINST ('Tutorial') | ++----+-----------------------------------------+ +| 1 | 0.64840710366884 | +| 2 | 0 | +| 3 | 0.66266459031789 | +| 4 | 0 | +| 5 | 0 | +| 6 | 0 | ++----+-----------------------------------------+ +5 rows in set (0.00 sec) +@end example + +This example shows how to retrieve the relevances. As neither @code{WHERE} +nor @code{ORDER BY} clauses are present, returned rows are not ordered. + +@example +mysql> SELECT id, body, MATCH (title,body) AGAINST ( + -> 'Security implications of running MySQL as root') AS score + -> FROM articles WHERE MATCH (title,body) AGAINST + -> ('Security implications of running MySQL as root'); ++----+-----------------------------------------------+-----------------+ +| id | body | score | ++----+-----------------------------------------------+-----------------+ +| 4 | 1. Never run mysqld as root. 2. Normalize ... | 1.5055546709332 | +| 6 | When configured properly, MySQL could be ... | 1.31140957288 | ++----+-----------------------------------------------+-----------------+ +2 rows in set (0.00 sec) +@end example + +This is more complex example - the query returns the relevance and still +sorts the rows with relevance decreasing. To achieve it one should specify +@code{MATCH} twice. Note, that this will cause no additional overhead, as +@strong{MySQL} optimizer will notice that these two @code{MATCH} calls are +identical and will call full-text search code only once. + +@strong{MySQL} uses a very simple parser to split text into words. A +``word'' is any sequence of letters, numbers, @samp{'}, and @samp{_}. Any +``word'' that is present in the stopword list or just too short (3 +characters or less) is ignored. Every correct word in the collection and in the query is weighted, according to its significance in the query or collection. This way, a @@ -29297,17 +29332,22 @@ carefully tuned this way). For very small tables, word distribution does not reflect adequately their semantical value, and this model may sometimes produce bizarre results. -For example, search for the word "search" will produce no results in the -above example. Word "search" is present in more than half of rows, and -as such, is effectively treated as a stopword (that is, with semantical value -zero). It is, really, the desired behavior - a natural language query -should not return every other row in 1GB table. +@example +mysql> SELECT * FROM articles WHERE MATCH (title,body) AGAINST ('MySQL'); +Empty set (0.00 sec) +@end example + +Search for the word @code{MySQL} produces no results in the above example. +Word @code{MySQL} is present in more than half of rows, and as such, is +effectively treated as a stopword (that is, with semantical value zero). +It is, really, the desired behavior - a natural language query should not +return every second row in 1GB table. A word that matches half of rows in a table is less likely to locate relevant documents. In fact, it will most likely find plenty of irrelevant documents. We all know this happens far too often when we are trying to find something on the Internet with a search engine. It is with this reasoning that such rows -have been assigned a low semantical value in @strong{a particular dataset}. +have been assigned a low semantical value in @strong{this particular dataset}. @menu * Fulltext Fine-tuning:: @@ -44120,6 +44160,9 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.38 @itemize @bullet @item +Fixed a bug when @code{SELECT} from @code{MERGE} table +sometimes results in incorrectly ordered rows. +@item Fixed a bug in @code{REPLACE()} when using the ujis character set. @item Applied Sleepycat BDB patches 3.2.9.1 and 3.2.9.2. diff --git a/myisammrg/mymrgdef.h b/myisammrg/mymrgdef.h index 564900614e2..aae1d07cd64 100644 --- a/myisammrg/mymrgdef.h +++ b/myisammrg/mymrgdef.h @@ -29,4 +29,3 @@ extern pthread_mutex_t THR_LOCK_open; #endif int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag); -int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type); diff --git a/myisammrg/myrg_rkey.c b/myisammrg/myrg_rkey.c index 6560380622a..cd2c73c8ec2 100644 --- a/myisammrg/myrg_rkey.c +++ b/myisammrg/myrg_rkey.c @@ -44,7 +44,6 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, MYRG_TABLE *table; MI_INFO *mi; int err; - byte *buf=((search_flag == HA_READ_KEY_EXACT) ? record: 0); LINT_INIT(key_buff); LINT_INIT(pack_key_length); @@ -57,14 +56,14 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, if (table == info->open_tables) { - err=mi_rkey(mi,buf,inx,key,key_len,search_flag); + err=mi_rkey(mi,0,inx,key,key_len,search_flag); key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length; pack_key_length=mi->last_rkey_length; } else { mi->use_packed_key=1; - err=mi_rkey(mi,buf,inx,key_buff,pack_key_length,search_flag); + err=mi_rkey(mi,0,inx,key_buff,pack_key_length,search_flag); mi->use_packed_key=0; } info->last_used_table=table+1; @@ -78,12 +77,6 @@ int myrg_rkey(MYRG_INFO *info,byte *record,int inx, const byte *key, /* adding to queue */ queue_insert(&(info->by_key),(byte *)table); - /* if looking for KEY_EXACT, return first matched now */ - if (buf) - { - info->current_table=table; - return 0; - } } if (!info->by_key.elements) diff --git a/myisammrg/myrg_rnext.c b/myisammrg/myrg_rnext.c index d5bc9c54339..5a3fbdfb299 100644 --- a/myisammrg/myrg_rnext.c +++ b/myisammrg/myrg_rnext.c @@ -29,7 +29,11 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx) if ((err=mi_rnext(info->current_table->table,NULL,inx))) { if (err == HA_ERR_END_OF_FILE) + { queue_remove(&(info->by_key),0); + if (!info->by_key.elements) + return HA_ERR_END_OF_FILE; + } else return err; } @@ -40,48 +44,7 @@ int myrg_rnext(MYRG_INFO *info, byte *buf, int inx) queue_replaced(&(info->by_key)); } - /* next, let's finish myrg_rkey's initial scan */ - if ((err=_myrg_finish_scan(info, inx, HA_READ_KEY_OR_NEXT))) - return err; - - if (!info->by_key.elements) - return HA_ERR_END_OF_FILE; - /* now, mymerge's read_next is as simple as one queue_top */ mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table; return mi_rrnd(mi,buf,mi->lastpos); } - - -/* let's finish myrg_rkey's initial scan */ - -int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type) -{ - int err; - MYRG_TABLE *table=info->last_used_table; - if (table < info->end_table) - { - MI_INFO *mi= table[-1].table; - byte *key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length; - uint pack_key_length= mi->last_rkey_length; - - for (; table < info->end_table ; table++) - { - mi=table->table; - mi->use_packed_key=1; - err=mi_rkey(mi,NULL,inx,key_buff,pack_key_length,type); - mi->use_packed_key=0; - if (err) - { - if (err == HA_ERR_KEY_NOT_FOUND) /* If end of file */ - continue; - return err; - } - /* Found here, adding to queue */ - queue_insert(&(info->by_key),(byte *) table); - } - /* All tables are now used */ - info->last_used_table=table; - } - return 0; -} diff --git a/myisammrg/myrg_rprev.c b/myisammrg/myrg_rprev.c index c63c73b4200..d8089e80498 100644 --- a/myisammrg/myrg_rprev.c +++ b/myisammrg/myrg_rprev.c @@ -29,7 +29,11 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx) if ((err=mi_rprev(info->current_table->table,NULL,inx))) { if (err == HA_ERR_END_OF_FILE) + { queue_remove(&(info->by_key),0); + if (!info->by_key.elements) + return HA_ERR_END_OF_FILE; + } else return err; } @@ -40,16 +44,7 @@ int myrg_rprev(MYRG_INFO *info, byte *buf, int inx) queue_replaced(&(info->by_key)); } - /* next, let's finish myrg_rkey's initial scan */ - if ((err=_myrg_finish_scan(info, inx, HA_READ_KEY_OR_PREV))) - return err; - - if (!info->by_key.elements) - return HA_ERR_END_OF_FILE; - /* now, mymerge's read_prev is as simple as one queue_top */ mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table; return mi_rrnd(mi,buf,mi->lastpos); } - - diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index 9e8e1b81687..653e25af799 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -127,3 +127,6 @@ t3 CREATE TABLE `t3` ( `othr` int(11) NOT NULL default '0' ) TYPE=MRG_MyISAM UNION=(t1,t2) a +a b +1 1 +1 2 diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 0b14ba388ce..619ec1d58af 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -96,3 +96,16 @@ drop table t3,t2,t1; create table t1 (a int not null) type=merge; select * from t1; drop table t1; + +# +# Bug found by Monty. +# + +drop table if exists t3, t2, t1; +create table t1 (a int not null, b int not null, key(a,b)); +create table t2 (a int not null, b int not null, key(a,b)); +create table t3 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2); +insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6); +insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); +flush tables; +select * from t3 where a=1 order by b limit 2; From 2ba0846a60ac43e1ef477bdfd95c37901b6c7fe7 Mon Sep 17 00:00:00 2001 From: "monty@donna.mysql.fi" <> Date: Thu, 17 May 2001 00:46:50 +0300 Subject: [PATCH 17/24] Fixed bug when using MERGE on files > 4G Fixed bug in SELECT db1.table.* FROM db1.table,db2.table Fixed bug in INSERT DELAYED when doing shutdown and a table was locked Changed that tmp_table_size =4G-1 means unlimited. --- Docs/manual.texi | 211 ++++++++++++++++++++++++++++++++++++------ client/mysql.cc | 2 +- myisam/mi_rkey.c | 2 +- myisam/mi_search.c | 8 +- myisammrg/myrg_rrnd.c | 2 +- mysys/getvar.c | 18 ++-- mysys/thr_lock.c | 2 +- sql/mysqld.cc | 4 +- sql/sql_base.cc | 15 +-- sql/sql_insert.cc | 13 ++- sql/sql_select.cc | 9 +- 11 files changed, 223 insertions(+), 63 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 5a37604a4eb..b5337f456a8 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -512,6 +512,11 @@ MyISAM Table Formats * Dynamic format:: Dynamic table characteristics * Compressed format:: Compressed table characteristics +MyISAM table problems. + +* Corrupted MyISAM tables:: +* MyISAM table close:: + BDB or Berkeley_DB Tables * BDB overview:: Overview of BDB Tables @@ -533,7 +538,7 @@ InnoDB Tables * InnoDB overview:: InnoDB tables overview * InnoDB start:: InnoDB startup options -* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. +* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. * Using InnoDB tables:: Creating InnoDB tables * Adding and removing:: Adding and removing InnoDB data and log files * Backing up:: Backing up and recovering an InnoDB database @@ -546,6 +551,35 @@ InnoDB Tables * InnoDB restrictions:: Some restrictions on InnoDB tables * InnoDB contact information:: InnoDB contact information. +Creating an InnoDB database + +* Error createing InnoDB:: + +Backing up and recovering an InnoDB database + +* InnoDB checkpoints:: + +InnoDB transaction model + +* InnoDB consinsten read:: +* InnoDB locking reads:: +* InnoDB Next-key locking:: +* InnoDB Locks set:: +* InnoDB Deadlock detection:: + +Table and index structures + +* InnoDB physical structure:: +* InnoDB Insert buffering:: +* InnoDB Adaptive hash:: +* InnoDB Physical record:: + +File space management and disk i/o + +* InnoDB Disk i/o:: +* InnoDB File space:: +* InnoDB File Defragmenting:: + MySQL Tutorial * Connecting-disconnecting:: Connecting to and disconnecting from the server @@ -927,6 +961,7 @@ Changes in release 4.0.x (Development; Alpha) Changes in release 3.23.x (Stable) +* News-3.23.39:: Changes in release 3.23.39 * News-3.23.38:: Changes in release 3.23.38 * News-3.23.37:: Changes in release 3.23.37 * News-3.23.36:: Changes in release 3.23.36 @@ -1091,7 +1126,7 @@ Debugging a MySQL server * Using gdb on mysqld:: * Using stack trace:: * Using log files:: -* Reproducable test case:: +* Reproduceable test case:: @end detailmenu @end menu @@ -3232,7 +3267,7 @@ It is most helpful when a good description of the problem is included in the bug report. That is, a good example of all the things you did that led to the problem and the problem itself exactly described. The best reports are those that include a full example showing how to reproduce the bug or -problem. @xref{Reproducable test case}. +problem. @xref{Reproduceable test case}. If a program produces an error message, it is very important to include the message in your report! If we try to search for something from the archives @@ -19672,8 +19707,13 @@ REPAIR TABLE tbl_name[,tbl_name...] [QUICK] [EXTENDED] @code{REPAIR TABLE} only works on @code{MyISAM} tables and is the same as running @code{myisamchk -r table_name} on the table. -Repair the corrupted table. The command returns a table with the following -columns: +Normally you should never have to run this command, but if disaster strikes +you are very likely to get back all your data from a MyISAM table with +@code{REPAIR TABLE}. If your tables get corrupted a lot you should +try to find the reason for this! @xref{Crashing}. @xref{MyISAM table problems}. + +@code{REPAIR TABLE} repairs a possible corrupted table. The command returns a +table with the following columns: @multitable @columnfractions .35 .65 @item @strong{Column} @tab @strong{Value} @@ -21136,7 +21176,7 @@ FLUSH flush_option [,flush_option] You should use the @code{FLUSH} command if you want to clear some of the internal caches @strong{MySQL} uses. To execute @code{FLUSH}, you must have -the @strong{reload} privilege. +the @strong{RELOAD} privilege. @code{flush_option} can be any of the following: @@ -23810,6 +23850,65 @@ Can be uncompressed with @code{myisamchk}. @node MyISAM table problems, , MyISAM table formats, MyISAM @subsection MyISAM table problems. +The file format that @strong{MySQL} uses to store data has been extensively +tested, but there are always circumstances that may cause database tables +to become corrupted. + +@menu +* Corrupted MyISAM tables:: +* MyISAM table close:: +@end menu + +@node Corrupted MyISAM tables, MyISAM table close, MyISAM table problems, MyISAM table problems +@subsubsection Corrupted MyISAM tables. + +Even if the MyISAM table format is very reliable (all changes to a table +is written before the SQL statements returns) , you can still get +corrupted tables if some of the following things happens: + +@itemize @bullet +@item +The @code{mysqld} process being killed in the middle of a write. +@item +Unexpected shutdown of the computer (for example, if the computer is turned +off). +@item +A hardware error. +@item +You are using an external program (like myisamchk) on a live table. +@item +A software bug in the MySQL or MyISAM code. +@end itemize + +Typial typical symptoms for a corrupt table is: + +@itemize @bullet +@item +You get the error @code{Incorrect key file for table: '...'. Try to repair it} +while selecting data from the table. +@item +Queries doesn't find rows in the table or returns incomplete data. +@end itemize + +You can check if a table is ok with the command @code{CHECK +TABLE}. @xref{CHECK TABLE}. + +You can repair a corrupted table with @code{REPAIR TABLE}. @xref{REPAIR TABLE}. +You can also repair a table, when @code{mysqld} is not running with +the @code{myisamchk} command. @code{myisamchk syntax}. + +If your tables get corrupted a lot you should try to find the reason for +this! @xref{Crashing}. + +In this case the most important thing to know is if the table got +corrupted if the @code{mysqld} died (one can easily verify this by +checking if there is a recent row @code{restarted mysqld} in the mysqld +error file). If this isn't the case, then you should try to make a test +case of this. @xref{Reproduceable test case}. + +@node MyISAM table close, , Corrupted MyISAM tables, MyISAM table problems +@subsubsection Clients is using or hasn't closed the table properly + Each @code{MyISAM} @code{.MYI} file has in the header a counter that can be used to check if a table has been closed properly. @@ -23854,7 +23953,8 @@ The @code{MyISAM} tables are copied without a @code{LOCK} and (Note that the table may still be ok, as @strong{MySQL} always issues writes for everything between each statement). @item -Someone has done a @code{myisamchk --repair} or @code{myisamchk --update-state}on a table that was in use by @code{mysqld}. +Someone has done a @code{myisamchk --repair} or @code{myisamchk +--update-state}on a table that was in use by @code{mysqld}. @item Many @code{mysqld} servers are using the table and one has done a @code{REPAIR} or @code{CHECK} of the table while it was in use by @@ -24504,7 +24604,7 @@ NuSphere is working on removing these limitations. @menu * InnoDB overview:: InnoDB tables overview * InnoDB start:: InnoDB startup options -* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. +* Creating an InnoDB database:: Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. Creating an InnoDB database. * Using InnoDB tables:: Creating InnoDB tables * Adding and removing:: Adding and removing InnoDB data and log files * Backing up:: Backing up and recovering an InnoDB database @@ -24761,6 +24861,11 @@ InnoDB: Started mysqld: ready for connections @end example +@menu +* Error createing InnoDB:: +@end menu + +@node Error createing InnoDB, , Creating an InnoDB database, Creating an InnoDB database @subsubsection If something goes wrong in database creation If something goes wrong in an InnoDB database creation, you should @@ -24917,6 +25022,11 @@ first find a backup which is not corrupted. From a backup do the recovery from the general log files of @strong{MySQL} according to instructions in the MySQL manual. +@menu +* InnoDB checkpoints:: +@end menu + +@node InnoDB checkpoints, , Backing up, Backing up @subsubsection Checkpoints InnoDB implements a checkpoint mechanism called a fuzzy @@ -24993,6 +25103,15 @@ and become visible to other users. A @code{ROLLBACK} on the other hand cancels all modifications made by the current transaction. +@menu +* InnoDB consinsten read:: +* InnoDB locking reads:: +* InnoDB Next-key locking:: +* InnoDB Locks set:: +* InnoDB Deadlock detection:: +@end menu + +@node InnoDB consinsten read, InnoDB locking reads, InnoDB transaction model, InnoDB transaction model @subsubsection Consistent read A consistent read means that InnoDB uses its multiversioning to @@ -25017,6 +25136,7 @@ on the tables it accesses, and therefore other users are free to modify those tables at the same time a consistent read is being performed on the table. +@node InnoDB locking reads, InnoDB Next-key locking, InnoDB consinsten read, InnoDB transaction model @subsubsection Locking reads A consistent read is not convenient in some circumstances. @@ -25073,6 +25193,7 @@ available data setting exclusive locks on each row it reads. Thus it sets the same locks a searched SQL @code{UPDATE} would set on the rows. +@node InnoDB Next-key locking, InnoDB Locks set, InnoDB locking reads, InnoDB transaction model @subsubsection Next-key locking: avoiding the 'phantom problem' In row level locking InnoDB uses an algorithm called next-key locking. @@ -25126,6 +25247,7 @@ anyone meanwhile inserting a duplicate for your row. Thus the next-key locking allows you to 'lock' the non-existence of something in your table. +@node InnoDB Locks set, InnoDB Deadlock detection, InnoDB Next-key locking, InnoDB transaction model @subsubsection Locks set by different SQL statements in InnoDB @itemize @bullet @@ -25177,6 +25299,7 @@ get a table lock on a table where another user currently has row level locks. But that does not put transaction integerity into danger. @end itemize +@node InnoDB Deadlock detection, , InnoDB Locks set, InnoDB transaction model @subsubsection Deadlock detection and rollback InnoDB automatically detects a deadlock of transactions and rolls @@ -25272,6 +25395,14 @@ uses this primary key value to search for the row from the clustered index. Note that if the primary key is long, the secondary indexes will use more space. +@menu +* InnoDB physical structure:: +* InnoDB Insert buffering:: +* InnoDB Adaptive hash:: +* InnoDB Physical record:: +@end menu + +@node InnoDB physical structure, InnoDB Insert buffering, Table and index, Table and index @subsubsection Physical structure of an index All indexes in InnoDB are B-trees where the index records are @@ -25286,6 +25417,7 @@ If records are inserted in a random order, then the pages will be 1/2 - 15/16 full. If the fillfactor of an index page drops below 1/2, InnoDB will try to contract the index tree to free the page. +@node InnoDB Insert buffering, InnoDB Adaptive hash, InnoDB physical structure, Table and index @subsubsection Insert buffering It is a common situation in a database application that the @@ -25312,6 +25444,7 @@ same page in of the index tree, and hence save disk i/o's. It has been measured that the insert buffer can speed up insertions to a table up to 15 times. +@node InnoDB Adaptive hash, InnoDB Physical record, InnoDB Insert buffering, Table and index @subsubsection Adaptive hash indexes If a database fits almost entirely in main memory, then the fastest way @@ -25334,6 +25467,7 @@ In a sense, through the adaptive hash index mechanism InnoDB adapts itself to ample main memory, coming closer to the architecture of main memory databases. +@node InnoDB Physical record, , InnoDB Adaptive hash, Table and index @subsubsection Physical record structure @itemize @bullet @@ -25360,6 +25494,13 @@ the pointer is 1 byte, else 2 bytes. @node File space management, Error handling, Table and index, InnoDB @subsection File space management and disk i/o +@menu +* InnoDB Disk i/o:: +* InnoDB File space:: +* InnoDB File Defragmenting:: +@end menu + +@node InnoDB Disk i/o, InnoDB File space, File space management, File space management @subsubsection Disk i/o In disk i/o InnoDB uses asynchronous i/o. On Windows NT @@ -25390,6 +25531,7 @@ in a tablespace seems to be in the process of being fully read into the buffer pool. Then InnoDB posts the remaining reads to the i/o system. +@node InnoDB File space, InnoDB File Defragmenting, InnoDB Disk i/o, File space management @subsubsection File space management The data files you define in the configuration file form the tablespace @@ -25436,6 +25578,7 @@ but remember that deleted rows can be physically removed only in a purge operation after they are no longer needed in transaction rollback or consistent read. +@node InnoDB File Defragmenting, , InnoDB File space, File space management @subsubsection Defragmenting a table If there are random insertions or deletions @@ -32830,8 +32973,13 @@ Temporary directory (instead of /tmp). You can use 'perldoc mysqlhotcopy' to get a more complete documentation for @code{mysqlhotcopy}. -@code{mysqlhotcopy} reads the group @code{[mysqlhotcopy]} from the option -files. +@code{mysqlhotcopy} reads the groups @code[client] and @code{[mysqlhotcopy]} +from the option files. + +To be able to execute @code{mysqlhotcopy} you need write access to the +backup directory, @code{SELECT} privilege to the tables you are about to +copy and the @strong{MySQL} @code{Reload} privilege (to be able to +execute @code{FLUSH TABLES}). @cindex importing, data @cindex data, importing @@ -34253,23 +34401,12 @@ the table (this also applies if you are using @code{--skip-locking}). If you don't take down @code{mysqld} you should at least do a @code{mysqladmin flush-tables} before you run @code{myisamchk}. -The file format that @strong{MySQL} uses to store data has been extensively -tested, but there are always external circumstances that may cause database -tables to become corrupted: - -@itemize @bullet -@item -The @code{mysqld} process being killed in the middle of a write. -@item -Unexpected shutdown of the computer (for example, if the computer is turned -off). -@item -A hardware error. -@end itemize - This chapter describes how to check for and deal with data corruption in @strong{MySQL} databases. If your tables get corrupted a lot you should -try to find the reason for this! @xref{Debugging server}. +try to find the reason for this! @xref{Crashing}. + +The @code{MyISAM} table section contains reason for why a table could be +corrupted. @xref{MyISAM table problems}. When performing crash recovery, it is important to understand that each table @code{tbl_name} in a database corresponds to three files in the database @@ -36117,7 +36254,7 @@ have been able to locate the bug and should do a bug report for this! @item Try to make a test case that we can use to reproduce the problem. -@xref{Reproducable test case}. +@xref{Reproduceable test case}. @item Try running the included mysql-test test and the @strong{MySQL} @@ -44176,6 +44313,7 @@ users uses this code as the rest of the code and because of this we are not yet 100% confident in this code. @menu +* News-3.23.39:: Changes in release 3.23.39 * News-3.23.38:: Changes in release 3.23.38 * News-3.23.37:: Changes in release 3.23.37 * News-3.23.36:: Changes in release 3.23.36 @@ -44218,7 +44356,20 @@ not yet 100% confident in this code. * News-3.23.0:: Changes in release 3.23.0 @end menu -@node News-3.23.38, News-3.23.37, News-3.23.x, News-3.23.x +@node News-3.23.39, News-3.23.38, News-3.23.x, News-3.23.x +@appendixsubsec Changes in release 3.23.39 +@itemize @bullet +@item +Fixed problem with shutdown when @code{INSERT DELAYED} was waiting for +a @code{LOCK TABLE}. +@item +Fixed coredump bug buged in InnoDB when tablespace was full. +@item +Fixed problem with @code{MERGE} tables and big tables (> 4G) when using +@code{ORDER BY}. +@end itemize + +@node News-3.23.38, News-3.23.37, News-3.23.39, News-3.23.x @appendixsubsec Changes in release 3.23.38 @itemize @bullet @item @@ -50011,7 +50162,7 @@ problems that may be unique to your environment. * Using gdb on mysqld:: * Using stack trace:: * Using log files:: -* Reproducable test case:: +* Reproduceable test case:: @end menu @node Compiling for debugging, Making trace files, Debugging server, Debugging server @@ -50256,7 +50407,7 @@ that killed @code{mysqld} and preferable a test case so that we can repeat the problem! @xref{Bug reports}. @end enumerate -@node Using log files, Reproducable test case, Using stack trace, Debugging server +@node Using log files, Reproduceable test case, Using stack trace, Debugging server @appendixsubsec Using log files to find cause of errors in mysqld Note that before starting @code{mysqld} with @code{--log} you should @@ -50306,7 +50457,7 @@ It's of course not a good sign if @code{mysqld} did died unexpectedly, but in this case one shouldn't investigate the @code{Checking table...} messages but instead try to find out why @code{mysqld} died. -@node Reproducable test case, , Using log files, Debugging server +@node Reproduceable test case, , Using log files, Debugging server @appendixsubsec Making a test case when you experience table corruption If you get corrupted tables or if @code{mysqld} always fails after some diff --git a/client/mysql.cc b/client/mysql.cc index c0c24c4fbe6..8d926a54840 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -340,7 +340,7 @@ int main(int argc,char *argv[]) } #endif sprintf(buff, - "Type 'help;' or '\\h' for help. Type '\\c' to clear the buffer\n"); + "Type 'help;' or '\\h' for help. Type '\\c' to clear the buffer.\n"); put_info(buff,INFO_INFO); status.exit_status=read_lines(1); // read lines and execute them if (opt_outfile) diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index 84612779f5d..0df390412b9 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -28,7 +28,7 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, uchar *key_buff; MYISAM_SHARE *share=info->s; uint pack_key_length; - DBUG_ENTER("_mi_rkey"); + DBUG_ENTER("mi_rkey"); DBUG_PRINT("enter",("base: %lx inx: %d search_flag: %d", info,inx,search_flag)); diff --git a/myisam/mi_search.c b/myisam/mi_search.c index 4dc5a5099d5..2c04679ed4c 100644 --- a/myisam/mi_search.c +++ b/myisam/mi_search.c @@ -158,7 +158,7 @@ int _mi_search(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->page_changed=0; info->buff_used= (info->buff != buff); /* If we have to reread buff */ - DBUG_PRINT("exit",("found key at %ld",info->lastpos)); + DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos)); DBUG_RETURN(0); err: DBUG_PRINT("exit",("Error: %d",my_errno)); @@ -1276,7 +1276,7 @@ int _mi_search_next(register MI_INFO *info, register MI_KEYDEF *keyinfo, } memcpy(info->lastkey,lastkey,info->lastkey_length); info->lastpos=_mi_dpos(info,0,info->lastkey+info->lastkey_length); - DBUG_PRINT("exit",("found key at %d",info->lastpos)); + DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos)); DBUG_RETURN(0); } /* _mi_search_next */ @@ -1318,7 +1318,7 @@ int _mi_search_first(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->page_changed=info->buff_used=0; info->lastpos=_mi_dpos(info,0,info->lastkey+info->lastkey_length); - DBUG_PRINT("exit",("found key at %d",info->lastpos)); + DBUG_PRINT("exit",("found key at %ld",(ulong) info->lastpos)); DBUG_RETURN(0); } /* _mi_search_first */ @@ -1362,7 +1362,7 @@ int _mi_search_last(register MI_INFO *info, register MI_KEYDEF *keyinfo, info->last_search_keypage=info->last_keypage; info->page_changed=info->buff_used=0; - DBUG_PRINT("exit",("found key at %d",info->lastpos)); + DBUG_PRINT("exit",("found key at %lu",(ulong) info->lastpos)); DBUG_RETURN(0); } /* _mi_search_last */ diff --git a/myisammrg/myrg_rrnd.c b/myisammrg/myrg_rrnd.c index 46bd3850bb5..de731e58d5b 100644 --- a/myisammrg/myrg_rrnd.c +++ b/myisammrg/myrg_rrnd.c @@ -88,7 +88,7 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos) isam_info->update&= HA_STATE_CHANGED; DBUG_RETURN((*isam_info->s->read_rnd) (isam_info, (byte*) buf, - (ha_rows) (filepos - info->current_table->file_offset), + (my_off_t) (filepos - info->current_table->file_offset), 0)); } diff --git a/mysys/getvar.c b/mysys/getvar.c index 21cac7f0d61..703ccc4ddfa 100644 --- a/mysys/getvar.c +++ b/mysys/getvar.c @@ -56,7 +56,7 @@ my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars) CHANGEABLE_VAR *var,*found; my_string var_end; const char *name; - long num; + longlong num; /* Skip end space from variable */ for (var_end=end ; end > str && isspace(var_end[-1]) ; var_end--) ; @@ -87,7 +87,7 @@ my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars) DBUG_RETURN(1); } - num=(long) atol(end); endchar=strend(end)[-1]; + num=atoll(end); endchar=strend(end)[-1]; if (endchar == 'k' || endchar == 'K') num*=1024; else if (endchar == 'm' || endchar == 'M') @@ -99,14 +99,12 @@ my_bool set_changeable_var(my_string str,CHANGEABLE_VAR *vars) fprintf(stderr,"Unknown prefix used for variable value '%s'\n",str); DBUG_RETURN(1); } - if (num < (long) found->min_value) - num=(long) found->min_value; - else if ((unsigned long) num > - (unsigned long) found->max_value) - num=(long) found->max_value; - *found->varptr=(long) ((ulong) (num-found->sub_size) / - (ulong) found->block_size); - (*found->varptr)*= (ulong) found->block_size; + if (num < (longlong) found->min_value) + num=(longlong) found->min_value; + else if (num > (longlong) (ulong) found->max_value) + num=(longlong) (ulong) found->max_value; + num=((num- (longlong) found->sub_size) / (ulonglong) found->block_size); + (*found->varptr)= (long) (num*(ulonglong) found->block_size); DBUG_RETURN(0); } } diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index ed21d466b35..74548b7fa12 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -370,7 +370,7 @@ static my_bool wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data, do { pthread_cond_wait(cond,&data->lock->mutex); - } while (data->cond == cond && !thread_var->abort); + } while (data->cond == cond && (!thread_var->abort || in_wait_list)); if (data->cond || data->type == TL_UNLOCK) { diff --git a/sql/mysqld.cc b/sql/mysqld.cc index c9e19b65a6c..7a0fb4ccddc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2701,7 +2701,7 @@ CHANGEABLE_VAR changeable_vars[] = { 1024, 4, 8192*1024L, 0, 1 }, { "max_tmp_tables", (long*) &max_tmp_tables, 32, 1, ~0L, 0, 1 }, - { "max_user_connections", (long*) &max_user_connections, + { "max_user_connections", (long*) &max_user_connections, 0, 1, ~0L, 0, 1 }, { "max_write_lock_count", (long*) &max_write_lock_count, ~0L, 1, ~0L, 0, 1 }, @@ -2737,7 +2737,7 @@ CHANGEABLE_VAR changeable_vars[] = { { "thread_cache_size", (long*) &thread_cache_size, 0, 0, 16384, 0, 1 }, { "tmp_table_size", (long*) &tmp_table_size, - 1024*1024L, 1024, ~0L, MALLOC_OVERHEAD, 1 }, + 32*1024*1024L, 1024, ~0L, 0, 1 }, { "thread_stack", (long*) &thread_stack, DEFAULT_THREAD_STACK, 1024*32, ~0L, 0, 1024 }, { "wait_timeout", (long*) &net_wait_timeout, diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 3c81723b61f..e7d63e1e5e4 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -34,8 +34,8 @@ HASH open_cache; /* Used by mysql_test */ static int open_unireg_entry(THD *thd,TABLE *entry,const char *db, const char *name, const char *alias, bool locked); -static bool insert_fields(THD *thd,TABLE_LIST *tables, const char *table_name, - List_iterator *it); +static bool insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, + const char *table_name, List_iterator *it); static void free_cache_entry(TABLE *entry); static void mysql_rm_tmp_tables(void); static key_map get_key_map_from_key_list(TABLE *table, @@ -1754,7 +1754,8 @@ int setup_fields(THD *thd, TABLE_LIST *tables, List &fields, if (item->type() == Item::FIELD_ITEM && ((Item_field*) item)->field_name[0] == '*') { - if (insert_fields(thd,tables,((Item_field*) item)->table_name,&it)) + if (insert_fields(thd,tables,((Item_field*) item)->db_name, + ((Item_field*) item)->table_name,&it)) DBUG_RETURN(-1); /* purecov: inspected */ } else @@ -1838,8 +1839,8 @@ static key_map get_key_map_from_key_list(TABLE *table, ****************************************************************************/ static bool -insert_fields(THD *thd,TABLE_LIST *tables, const char *table_name, - List_iterator *it) +insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, + const char *table_name, List_iterator *it) { uint found; DBUG_ENTER("insert_fields"); @@ -1851,7 +1852,9 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *table_name, if (grant_option && !thd->master_access && check_grant_all_columns(thd,SELECT_ACL,table) ) DBUG_RETURN(-1); - if (!table_name || !strcmp(table_name,tables->name)) + if (!table_name || (!strcmp(table_name,tables->name) && + (!db_name || !tables->db || + !strcmp(tables->db,db_name)))) { Field **ptr=table->field,*field; thd->used_tables|=table->map; diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 3be195b8984..cfd16df5d17 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1088,6 +1088,7 @@ bool delayed_insert::handle_inserts(void) int error; uint max_rows; bool using_ignore=0; + delayed_row *row; DBUG_ENTER("handle_inserts"); /* Allow client to insert new rows */ @@ -1113,7 +1114,6 @@ bool delayed_insert::handle_inserts(void) table->file->extra(HA_EXTRA_WRITE_CACHE); pthread_mutex_lock(&mutex); - delayed_row *row; while ((row=rows.get())) { stacked_inserts--; @@ -1138,9 +1138,7 @@ bool delayed_insert::handle_inserts(void) if (write_record(table,&info)) { info.error++; // Ignore errors - pthread_mutex_lock(&LOCK_delayed_status); - delayed_insert_errors++; - pthread_mutex_unlock(&LOCK_delayed_status); + thread_safe_increment(delayed_insert_errors,&LOCK_delayed_status); row->log_query = 0; } if (using_ignore) @@ -1209,6 +1207,13 @@ bool delayed_insert::handle_inserts(void) DBUG_RETURN(0); err: + /* Remove all not used rows */ + while ((row=rows.get())) + { + delete row; + thread_safe_increment(delayed_insert_errors,&LOCK_delayed_status); + stacked_inserts--; + } thread_safe_increment(delayed_insert_errors, &LOCK_delayed_status); pthread_mutex_lock(&mutex); DBUG_RETURN(1); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c2b5662d436..f464c237d78 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -3554,9 +3554,12 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List &fields, param->recinfo=recinfo; store_record(table,2); // Make empty default record - table->max_rows=(((table->db_type == DB_TYPE_HEAP) ? - min(tmp_table_size, max_heap_table_size) : tmp_table_size)/ - table->reclength); + if (tmp_table_size == ~(ulong) 0) // No limit + table->max_rows= ~(ha_rows) 0; + else + table->max_rows=(((table->db_type == DB_TYPE_HEAP) ? + min(tmp_table_size, max_heap_table_size) : + tmp_table_size)/ table->reclength); set_if_bigger(table->max_rows,1); // For dummy start options keyinfo=param->keyinfo; From 8382f16e015e330adc20573f168222891d4c8a89 Mon Sep 17 00:00:00 2001 From: "mwagner@evoq.mwagner.org" <> Date: Thu, 17 May 2001 13:59:52 -0500 Subject: [PATCH 18/24] manual.texi Added a mirror, adjusted some URLs. --- BitKeeper/etc/logging_ok | 12 +----------- Docs/manual.texi | 12 +++++++++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index f9538335046..8bf83e5a369 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,11 +1 @@ -heikki@donna.mysql.fi -jani@hynda.mysql.fi -jcole@abel.spaceapes.com -jcole@main.burghcom.com -jcole@tetra.spaceapes.com -monty@donna.mysql.fi -monty@work.mysql.com -paul@central.snake.net -sasha@mysql.sashanet.com -serg@serg.mysql.com -tim@threads.polyesthetic.msg +mwagner@evoq.mwagner.org diff --git a/Docs/manual.texi b/Docs/manual.texi index 76cf02a40ff..70352d2872d 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -1629,7 +1629,7 @@ contributing to the development of @strong{MySQL}. @item Downloadable examples @tab @uref{http://www.kitebird.com/mysql-book/, @code{samp_db} distribution} @item Errata @tab - @uref{http://www.kitebird.com/mysql-book/errata.html, are available here} +@uref{http://www.kitebird.com/mysql-book/errata.html, are available here} @end multitable Foreword by Michael ``Monty'' Widenius, @strong{MySQL} Moderator. @@ -4454,6 +4454,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}. @uref{http://mysql.sote.hu/, WWW} @uref{ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/, FTP} +@item +@c EMAIL: hendlein@tiszanet.hu (Hendlein Peter) +@image{Flags/hungary} Hungary [TiszaneT] @ +@uref{http://mysql.tiszanet.hu/, WWW} +@uref{ftp://mysql.tiszanet.hu/pub/mirrors/mysql/, FTP} + @item @c EMAIL: mirrors@gm.is (Tomas Edwardsson) @image{Flags/iceland} Iceland [GM] @ @@ -33013,7 +33019,7 @@ Temporary directory (instead of /tmp). You can use 'perldoc mysqlhotcopy' to get a more complete documentation for @code{mysqlhotcopy}. -@code{mysqlhotcopy} reads the groups @code[client] and @code{[mysqlhotcopy]} +@code{mysqlhotcopy} reads the groups @code{[client]} and @code{[mysqlhotcopy]} from the option files. To be able to execute @code{mysqlhotcopy} you need write access to the @@ -43421,7 +43427,7 @@ A Web-based mysql administrator by Mike Machado. @item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.0.1.tar.gz,phpMyAdmin_2.0.1.tar.gz} A set of PHP3-scripts to adminstrate @strong{MySQL} over the WWW. -@item @uref{http://www.htmlwizard.net/phpMyAdmin/, phpMyAdmin home page} +@item @uref{http://www.phpwizard.net/projects/phpMyAdmin/, phpMyAdmin home page} A PHP3 tool in the spirit of mysql-webadmin, by Tobias Ratschiller, tobias@@dnet.it. @item @uref{http://www.mysql.com/Downloads/Contrib/useradm.tar.gz, useradm.tar.gz} From 6e716f475df40a0759455584304a968e384e9ab2 Mon Sep 17 00:00:00 2001 From: "tim@threads.polyesthetic.msg" <> Date: Fri, 18 May 2001 12:43:16 -0400 Subject: [PATCH 19/24] Clean out some more generated files from the bdb tree. Add a hack to bdb/dist/s_rpc so that bk doesn't complain about the rpc_server/db_server_proc.c file that gets overwritten (but needs to be stored in BK). Add a bdb/dist/template directory which is needed by bdb/dist/s_recover. --- .bzrignore | 33 + bdb/build_win32/db_archive.dsp | 151 ----- bdb/build_win32/db_checkpoint.dsp | 151 ----- bdb/build_win32/db_deadlock.dsp | 151 ----- bdb/build_win32/db_dll.dsp | 753 -------------------- bdb/build_win32/db_dump.dsp | 151 ----- bdb/build_win32/db_java.dsp | 174 ----- bdb/build_win32/db_load.dsp | 151 ----- bdb/build_win32/db_printlog.dsp | 151 ----- bdb/build_win32/db_recover.dsp | 151 ----- bdb/build_win32/db_stat.dsp | 151 ----- bdb/build_win32/db_static.dsp | 714 ------------------- bdb/build_win32/db_tcl.dsp | 135 ---- bdb/build_win32/db_upgrade.dsp | 151 ----- bdb/build_win32/db_verify.dsp | 151 ----- bdb/build_win32/ex_access.dsp | 151 ----- bdb/build_win32/ex_btrec.dsp | 151 ----- bdb/build_win32/ex_env.dsp | 151 ----- bdb/build_win32/ex_lock.dsp | 151 ----- bdb/build_win32/ex_mpool.dsp | 151 ----- bdb/build_win32/ex_tpcb.dsp | 151 ----- bdb/build_win32/excxx_access.dsp | 151 ----- bdb/build_win32/excxx_btrec.dsp | 151 ----- bdb/build_win32/excxx_env.dsp | 151 ----- bdb/build_win32/excxx_lock.dsp | 151 ----- bdb/build_win32/excxx_mpool.dsp | 151 ----- bdb/build_win32/excxx_tpcb.dsp | 151 ----- bdb/dist/s_rpc | 16 +- bdb/dist/template/.IGNORE_ME | 3 + bdb/dist/template/db_server_proc | 1057 ----------------------------- bdb/dist/template/gen_client_ret | 522 -------------- bdb/include/gen_client_ext.h | 121 ---- bdb/include/gen_server_ext.h | 106 --- bdb/rpc_server/db_server.x | 492 -------------- bdb/rpc_server/db_server_proc.sed | 418 ------------ bdb/test/logtrack.list | 68 -- 36 files changed, 50 insertions(+), 7884 deletions(-) delete mode 100644 bdb/build_win32/db_archive.dsp delete mode 100644 bdb/build_win32/db_checkpoint.dsp delete mode 100644 bdb/build_win32/db_deadlock.dsp delete mode 100644 bdb/build_win32/db_dll.dsp delete mode 100644 bdb/build_win32/db_dump.dsp delete mode 100644 bdb/build_win32/db_java.dsp delete mode 100644 bdb/build_win32/db_load.dsp delete mode 100644 bdb/build_win32/db_printlog.dsp delete mode 100644 bdb/build_win32/db_recover.dsp delete mode 100644 bdb/build_win32/db_stat.dsp delete mode 100644 bdb/build_win32/db_static.dsp delete mode 100644 bdb/build_win32/db_tcl.dsp delete mode 100644 bdb/build_win32/db_upgrade.dsp delete mode 100644 bdb/build_win32/db_verify.dsp delete mode 100644 bdb/build_win32/ex_access.dsp delete mode 100644 bdb/build_win32/ex_btrec.dsp delete mode 100644 bdb/build_win32/ex_env.dsp delete mode 100644 bdb/build_win32/ex_lock.dsp delete mode 100644 bdb/build_win32/ex_mpool.dsp delete mode 100644 bdb/build_win32/ex_tpcb.dsp delete mode 100644 bdb/build_win32/excxx_access.dsp delete mode 100644 bdb/build_win32/excxx_btrec.dsp delete mode 100644 bdb/build_win32/excxx_env.dsp delete mode 100644 bdb/build_win32/excxx_lock.dsp delete mode 100644 bdb/build_win32/excxx_mpool.dsp delete mode 100644 bdb/build_win32/excxx_tpcb.dsp create mode 100644 bdb/dist/template/.IGNORE_ME delete mode 100644 bdb/dist/template/db_server_proc delete mode 100644 bdb/dist/template/gen_client_ret delete mode 100644 bdb/include/gen_client_ext.h delete mode 100644 bdb/include/gen_server_ext.h delete mode 100644 bdb/rpc_server/db_server.x delete mode 100644 bdb/rpc_server/db_server_proc.sed delete mode 100644 bdb/test/logtrack.list diff --git a/.bzrignore b/.bzrignore index 502efd1f30a..a24e77758eb 100644 --- a/.bzrignore +++ b/.bzrignore @@ -248,3 +248,36 @@ innobase/ib_config.h innobase/ib_config.h.in mysql.proj client/mysqlcheck +bdb/build_win32/db_archive.dsp +bdb/build_win32/db_checkpoint.dsp +bdb/build_win32/db_deadlock.dsp +bdb/build_win32/db_dump.dsp +bdb/build_win32/db_load.dsp +bdb/build_win32/db_printlog.dsp +bdb/build_win32/db_recover.dsp +bdb/build_win32/db_stat.dsp +bdb/build_win32/db_upgrade.dsp +bdb/build_win32/db_verify.dsp +bdb/build_win32/ex_access.dsp +bdb/build_win32/ex_btrec.dsp +bdb/build_win32/ex_env.dsp +bdb/build_win32/ex_lock.dsp +bdb/build_win32/ex_mpool.dsp +bdb/build_win32/ex_tpcb.dsp +bdb/build_win32/excxx_access.dsp +bdb/build_win32/excxx_btrec.dsp +bdb/build_win32/excxx_env.dsp +bdb/build_win32/excxx_lock.dsp +bdb/build_win32/excxx_mpool.dsp +bdb/build_win32/excxx_tpcb.dsp +bdb/build_win32/db_dll.dsp +bdb/build_win32/db_java.dsp +bdb/build_win32/db_static.dsp +bdb/build_win32/db_tcl.dsp +bdb/dist/template/gen_client_ret +bdb/dist/template/db_server_proc +bdb/include/gen_client_ext.h +bdb/include/gen_server_ext.h +bdb/rpc_server/db_server_proc.sed +bdb/rpc_server/db_server.x +bdb/test/logtrack.list diff --git a/bdb/build_win32/db_archive.dsp b/bdb/build_win32/db_archive.dsp deleted file mode 100644 index 4b8509950ef..00000000000 --- a/bdb/build_win32/db_archive.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_archive" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_archive - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_archive.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_archive.mak" CFG="db_archive - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_archive - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_archive - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_archive - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_archive - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_archive - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_archive - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_archive - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_archive - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_archive - Win32 Release" -# Name "db_archive - Win32 Debug" -# Name "db_archive - Win32 Release Static" -# Name "db_archive - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_archive\db_archive.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_checkpoint.dsp b/bdb/build_win32/db_checkpoint.dsp deleted file mode 100644 index ac464a07ab8..00000000000 --- a/bdb/build_win32/db_checkpoint.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_checkpoint" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_checkpoint - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_checkpoint.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_checkpoint.mak" CFG="db_checkpoint - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_checkpoint - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_checkpoint - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_checkpoint - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_checkpoint - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_checkpoint - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_checkpoint - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_checkpoint - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_checkpoint - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_checkpoint - Win32 Release" -# Name "db_checkpoint - Win32 Debug" -# Name "db_checkpoint - Win32 Release Static" -# Name "db_checkpoint - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_checkpoint\db_checkpoint.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_deadlock.dsp b/bdb/build_win32/db_deadlock.dsp deleted file mode 100644 index 429896ded04..00000000000 --- a/bdb/build_win32/db_deadlock.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_deadlock" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_deadlock - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_deadlock.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_deadlock.mak" CFG="db_deadlock - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_deadlock - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_deadlock - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_deadlock - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_deadlock - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_deadlock - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_deadlock - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_deadlock - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_deadlock - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_deadlock - Win32 Release" -# Name "db_deadlock - Win32 Debug" -# Name "db_deadlock - Win32 Release Static" -# Name "db_deadlock - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_deadlock\db_deadlock.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_dll.dsp b/bdb/build_win32/db_dll.dsp deleted file mode 100644 index d394e0313fd..00000000000 --- a/bdb/build_win32/db_dll.dsp +++ /dev/null @@ -1,753 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_dll" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=db_dll - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_dll.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_dll.mak" CFG="db_dll - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_dll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "db_dll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "db_dll - Win32 Release Static" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "db_dll - Win32 Debug Static" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_dll - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "." /I "../include" /D "DB_CREATE_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 /nologo /base:"0x13000000" /subsystem:windows /dll /machine:I386 /out:"Release/libdb32.dll" - -!ELSEIF "$(CFG)" == "db_dll - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "DB_CREATE_DLL" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /YX"config.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /base:"0x13000000" /subsystem:windows /dll /pdb:none /debug /machine:I386 /out:"Debug/libdb32d.dll" /fixed:no - -!ELSEIF "$(CFG)" == "db_dll - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DB_DLL__" -# PROP BASE Intermediate_Dir "DB_DLL__" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "." /I "../include" /D "DB_CREATE_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "." /I "../include" /D "DB_CREATE_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /base:"0x13000000" /subsystem:windows /dll /machine:I386 /out:"Release/libdb32.dll" -# ADD LINK32 /nologo /base:"0x13000000" /subsystem:windows /dll /machine:I386 /out:"Release/libdb32.dll" - -!ELSEIF "$(CFG)" == "db_dll - Win32 Debug Static" - -# PROP BASE Use_MFC 2 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DB_DLL_0" -# PROP BASE Intermediate_Dir "DB_DLL_0" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "DB_CREATE_DLL" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /YX"config.h" /FD /c -# SUBTRACT BASE CPP /Fr -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "DB_CREATE_DLL" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_MBCS" /YX"config.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 /nologo /base:"0x13000000" /subsystem:windows /dll /pdb:none /debug /machine:I386 /out:"Debug/libdb32d.dll" /fixed:no -# ADD LINK32 /nologo /base:"0x13000000" /subsystem:windows /dll /pdb:none /debug /machine:I386 /out:"Debug/libdb32d.dll" /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_dll - Win32 Release" -# Name "db_dll - Win32 Debug" -# Name "db_dll - Win32 Release Static" -# Name "db_dll - Win32 Debug Static" -# Begin Source File - -SOURCE=..\btree\bt_compare.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_conv.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_curadj.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_cursor.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_delete.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_method.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_open.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_put.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_rec.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_reclaim.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_recno.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_rsearch.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_search.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_split.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_stat.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_verify.c -# End Source File -# Begin Source File - -SOURCE=..\btree\btree_auto.c -# End Source File -# Begin Source File - -SOURCE=.\dllmain.c -# End Source File -# Begin Source File - -SOURCE=.\libdb.def -# End Source File -# Begin Source File - -SOURCE=.\libdb.rc -# End Source File -# Begin Source File - -SOURCE=..\clib\strcasecmp.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_byteorder.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_err.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_getlong.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_log2.c -# End Source File -# Begin Source File - -SOURCE=..\common\util_log.c -# End Source File -# Begin Source File - -SOURCE=..\common\util_sig.c -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_app.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_except.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_lock.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_log.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_mpool.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_table.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_txn.cpp -# End Source File -# Begin Source File - -SOURCE=..\db\crdel_auto.c -# End Source File -# Begin Source File - -SOURCE=..\db\crdel_rec.c -# End Source File -# Begin Source File - -SOURCE=..\db\db.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_am.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_auto.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_cam.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_conv.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_dispatch.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_dup.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_iface.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_join.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_meta.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_method.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_overflow.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_pr.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_rec.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_reclaim.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_ret.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_upg.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_upg_opd.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_vrfy.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_vrfyutil.c -# End Source File -# Begin Source File - -SOURCE=..\dbm\dbm.c -# End Source File -# Begin Source File - -SOURCE=..\env\db_salloc.c -# End Source File -# Begin Source File - -SOURCE=..\env\db_shash.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_method.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_open.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_recover.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_region.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_auto.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_conv.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_dup.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_func.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_meta.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_method.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_page.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_rec.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_reclaim.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_stat.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_verify.c -# End Source File -# Begin Source File - -SOURCE=..\hsearch\hsearch.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_conflict.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_deadlock.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_method.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_region.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_stat.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_util.c -# End Source File -# Begin Source File - -SOURCE=..\log\log.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_archive.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_auto.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_compare.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_findckp.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_get.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_method.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_put.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_rec.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_register.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_alloc.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_bh.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fget.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fopen.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fput.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fset.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_method.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_region.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_register.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_stat.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_sync.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_trickle.c -# End Source File -# Begin Source File - -SOURCE=..\mutex\mut_tas.c -# End Source File -# Begin Source File - -SOURCE=..\mutex\mutex.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_alloc.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_fsync.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_handle.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_method.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_oflags.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_region.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_root.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_rpath.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_rw.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_stat.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_tmpdir.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_unlink.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_abs.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_dir.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_errno.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_fid.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_finit.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_map.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_open.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_rename.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_seek.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_sleep.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_spin.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_type.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_auto.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_conv.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_files.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_method.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_open.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_rec.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_stat.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_verify.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn_auto.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn_rec.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn_region.c -# End Source File -# Begin Source File - -SOURCE=..\xa\xa.c -# End Source File -# Begin Source File - -SOURCE=..\xa\xa_db.c -# End Source File -# Begin Source File - -SOURCE=..\xa\xa_map.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_dump.dsp b/bdb/build_win32/db_dump.dsp deleted file mode 100644 index f4808b5138d..00000000000 --- a/bdb/build_win32/db_dump.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_dump" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_dump - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_dump.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_dump.mak" CFG="db_dump - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_dump - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_dump - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_dump - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_dump - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_dump - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_dump - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_dump - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_dump - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_dump - Win32 Release" -# Name "db_dump - Win32 Debug" -# Name "db_dump - Win32 Release Static" -# Name "db_dump - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_dump\db_dump.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_java.dsp b/bdb/build_win32/db_java.dsp deleted file mode 100644 index 0a0d9dc0fcb..00000000000 --- a/bdb/build_win32/db_java.dsp +++ /dev/null @@ -1,174 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_java" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=db_java - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_java.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_java.mak" CFG="db_java - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_java - Win32 Release" (based on\ - "Win32 (x86) Dynamic-Link Library") -!MESSAGE "db_java - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_java - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "DB_CREATE_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /base:"0x13000000" /subsystem:windows /dll /machine:I386 /out:"Release/libdb_java32.dll" -# Begin Custom Build - Compiling java files using javac -ProjDir=. -InputPath=.\Release\libdb_java32.dll -SOURCE=$(InputPath) - -"force_compilation.txt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd $(ProjDir)\..\java\src\com\sleepycat\db - mkdir ..\..\..\..\classes - echo compiling Berkeley DB classes - javac -d ../../../../classes -classpath "$(CLASSPATH);../../../../classes"\ - *.java - echo compiling examples - cd ..\examples - javac -d ../../../../classes -classpath "$(CLASSPATH);../../../../classes"\ - *.java - echo creating jar file - cd ..\..\..\..\classes - jar cf db.jar com\sleepycat\db\*.class - echo Java build finished - -# End Custom Build - -!ELSEIF "$(CFG)" == "db_java - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "DB_CREATE_DLL" /D "_WINDLL" /D "_AFXDLL" /YX"config.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /base:"0x13000000" /subsystem:windows /dll /pdb:none /debug /machine:I386 /out:"Debug/libdb_java32d.dll" /fixed:no -# Begin Custom Build - Compiling java files using javac -ProjDir=. -InputPath=.\Debug\libdb_java32d.dll -SOURCE=$(InputPath) - -"force_compilation.txt" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - cd $(ProjDir)\..\java\src\com\sleepycat\db - mkdir ..\..\..\..\classes - echo compiling Berkeley DB classes - javac -g -d ../../../../classes -classpath "$(CLASSPATH);../../../../classes"\ - *.java - echo compiling examples - javac -g -d ../../../../classes -classpath "$(CLASSPATH);../../../../classes"\ - *.java - cd ..\examples - echo creating jar file - cd ..\..\..\..\classes - jar cf db.jar com\sleepycat\db\*.class - echo Java build finished - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "db_java - Win32 Release" -# Name "db_java - Win32 Debug" -# Begin Source File - -SOURCE=..\libdb_java\java_Db.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_DbEnv.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_DbLock.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_DbLsn.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_DbTxn.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_Dbc.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_Dbt.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_info.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_locked.c -# End Source File -# Begin Source File - -SOURCE=..\libdb_java\java_util.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_load.dsp b/bdb/build_win32/db_load.dsp deleted file mode 100644 index adec8475a88..00000000000 --- a/bdb/build_win32/db_load.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_load" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_load - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_load.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_load.mak" CFG="db_load - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_load - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_load - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_load - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_load - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_load - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_load - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_load - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_load - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_load - Win32 Release" -# Name "db_load - Win32 Debug" -# Name "db_load - Win32 Release Static" -# Name "db_load - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_load\db_load.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_printlog.dsp b/bdb/build_win32/db_printlog.dsp deleted file mode 100644 index 8b3fbd9fe31..00000000000 --- a/bdb/build_win32/db_printlog.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_printlog" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_printlog - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_printlog.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_printlog.mak" CFG="db_printlog - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_printlog - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_printlog - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_printlog - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_printlog - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_printlog - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_printlog - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_printlog - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_printlog - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_printlog - Win32 Release" -# Name "db_printlog - Win32 Debug" -# Name "db_printlog - Win32 Release Static" -# Name "db_printlog - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_printlog\db_printlog.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_recover.dsp b/bdb/build_win32/db_recover.dsp deleted file mode 100644 index bf07631f9b9..00000000000 --- a/bdb/build_win32/db_recover.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_recover" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_recover - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_recover.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_recover.mak" CFG="db_recover - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_recover - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_recover - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_recover - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_recover - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_recover - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_recover - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_recover - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_recover - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_recover - Win32 Release" -# Name "db_recover - Win32 Debug" -# Name "db_recover - Win32 Release Static" -# Name "db_recover - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_recover\db_recover.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_stat.dsp b/bdb/build_win32/db_stat.dsp deleted file mode 100644 index 3e906897e68..00000000000 --- a/bdb/build_win32/db_stat.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_stat" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_stat - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_stat.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_stat.mak" CFG="db_stat - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_stat - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_stat - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_stat - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_stat - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_stat - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_stat - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_stat - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_stat - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_stat - Win32 Release" -# Name "db_stat - Win32 Debug" -# Name "db_stat - Win32 Release Static" -# Name "db_stat - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_stat\db_stat.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_static.dsp b/bdb/build_win32/db_static.dsp deleted file mode 100644 index 0c355241537..00000000000 --- a/bdb/build_win32/db_static.dsp +++ /dev/null @@ -1,714 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_static" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Static Library" 0x0104 - -CFG=db_static - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_static.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_static.mak" CFG="db_static - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_static - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "db_static - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE "db_static - Win32 Release Static" (based on\ - "Win32 (x86) Static Library") -!MESSAGE "db_static - Win32 Debug Static" (based on\ - "Win32 (x86) Static Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe - -!IF "$(CFG)" == "db_static - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DB_Stati" -# PROP BASE Intermediate_Dir "DB_Stati" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX"config.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Release_static/libdb32s.lib" - -!ELSEIF "$(CFG)" == "db_static - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DB_Stat0" -# PROP BASE Intermediate_Dir "DB_Stat0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX"config.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"Debug_static/libdb32sd.lib" - -!ELSEIF "$(CFG)" == "db_static - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "DB_Stati" -# PROP BASE Intermediate_Dir "DB_Stati" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX"config.h" /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX"config.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"Release/libdb32s.lib" -# ADD LIB32 /nologo /out:"Release_static/libdb32s.lib" - -!ELSEIF "$(CFG)" == "db_static - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "DB_Stat0" -# PROP BASE Intermediate_Dir "DB_Stat0" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX"config.h" /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX"config.h" /FD /c -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"Debug/libdb32sd.lib" -# ADD LIB32 /nologo /out:"Debug_static/libdb32sd.lib" - -!ENDIF - -# Begin Target - -# Name "db_static - Win32 Release" -# Name "db_static - Win32 Debug" -# Name "db_static - Win32 Release Static" -# Name "db_static - Win32 Debug Static" -# Begin Source File - -SOURCE=..\btree\bt_compare.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_conv.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_curadj.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_cursor.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_delete.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_method.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_open.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_put.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_rec.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_reclaim.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_recno.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_rsearch.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_search.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_split.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_stat.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\btree\bt_verify.c -# End Source File -# Begin Source File - -SOURCE=..\btree\btree_auto.c -# End Source File -# Begin Source File - -SOURCE=..\clib\strcasecmp.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_byteorder.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_err.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_getlong.c -# End Source File -# Begin Source File - -SOURCE=..\common\db_log2.c -# End Source File -# Begin Source File - -SOURCE=..\common\util_log.c -# End Source File -# Begin Source File - -SOURCE=..\common\util_sig.c -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_app.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_except.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_lock.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_log.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_mpool.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_table.cpp -# End Source File -# Begin Source File - -SOURCE=..\cxx\cxx_txn.cpp -# End Source File -# Begin Source File - -SOURCE=..\db\crdel_auto.c -# End Source File -# Begin Source File - -SOURCE=..\db\crdel_rec.c -# End Source File -# Begin Source File - -SOURCE=..\db\db.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_am.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_auto.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_cam.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_conv.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_dispatch.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_dup.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_iface.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_join.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_meta.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_method.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_overflow.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_pr.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_rec.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_reclaim.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_ret.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_upg.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_upg_opd.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_vrfy.c -# End Source File -# Begin Source File - -SOURCE=..\db\db_vrfyutil.c -# End Source File -# Begin Source File - -SOURCE=..\dbm\dbm.c -# End Source File -# Begin Source File - -SOURCE=..\env\db_salloc.c -# End Source File -# Begin Source File - -SOURCE=..\env\db_shash.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_method.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_open.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_recover.c -# End Source File -# Begin Source File - -SOURCE=..\env\env_region.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_auto.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_conv.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_dup.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_func.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_meta.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_method.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_page.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_rec.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_reclaim.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_stat.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\hash\hash_verify.c -# End Source File -# Begin Source File - -SOURCE=..\hsearch\hsearch.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_conflict.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_deadlock.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_method.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_region.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_stat.c -# End Source File -# Begin Source File - -SOURCE=..\lock\lock_util.c -# End Source File -# Begin Source File - -SOURCE=..\log\log.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_archive.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_auto.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_compare.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_findckp.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_get.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_method.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_put.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_rec.c -# End Source File -# Begin Source File - -SOURCE=..\log\log_register.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_alloc.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_bh.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fget.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fopen.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fput.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_fset.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_method.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_region.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_register.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_stat.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_sync.c -# End Source File -# Begin Source File - -SOURCE=..\mp\mp_trickle.c -# End Source File -# Begin Source File - -SOURCE=..\mutex\mut_tas.c -# End Source File -# Begin Source File - -SOURCE=..\mutex\mutex.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_alloc.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_fsync.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_handle.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_method.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_oflags.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_region.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_root.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_rpath.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_rw.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_stat.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_tmpdir.c -# End Source File -# Begin Source File - -SOURCE=..\os\os_unlink.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_abs.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_dir.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_errno.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_fid.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_finit.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_map.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_open.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_rename.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_seek.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_sleep.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_spin.c -# End Source File -# Begin Source File - -SOURCE=..\os_win32\os_type.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_auto.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_conv.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_files.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_method.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_open.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_rec.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_stat.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\qam\qam_verify.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn_auto.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn_rec.c -# End Source File -# Begin Source File - -SOURCE=..\txn\txn_region.c -# End Source File -# Begin Source File - -SOURCE=..\xa\xa.c -# End Source File -# Begin Source File - -SOURCE=..\xa\xa_db.c -# End Source File -# Begin Source File - -SOURCE=..\xa\xa_map.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_tcl.dsp b/bdb/build_win32/db_tcl.dsp deleted file mode 100644 index 5a0712c3f82..00000000000 --- a/bdb/build_win32/db_tcl.dsp +++ /dev/null @@ -1,135 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_tcl" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=db_tcl - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_tcl.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_tcl.mak" CFG="db_tcl - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_tcl - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "db_tcl - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_tcl - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "." /I "../include" /D "DB_TCL_SUPPORT" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "DB_CREATE_DLL" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386 -# ADD LINK32 Release/libdb32.lib tcl83.lib /nologo /base:"0x13000000" /subsystem:windows /dll /machine:I386 /out:"Release/libdb_tcl32.dll" - -!ELSEIF "$(CFG)" == "db_tcl - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 2 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "DB_TCL_SUPPORT" /D "CONFIG_TEST" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "DB_CREATE_DLL" /D "_WINDLL" /D "_AFXDLL" /YX"config.h" /FD /c -# SUBTRACT CPP /Fr -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib tcl83d.lib /nologo /base:"0x13000000" /subsystem:windows /dll /pdb:none /debug /machine:I386 /out:"Debug/libdb_tcl32d.dll" /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_tcl - Win32 Release" -# Name "db_tcl - Win32 Debug" -# Begin Source File - -SOURCE=.\libdb_tcl.def -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_compat.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_db.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_db_pkg.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_dbcursor.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_env.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_internal.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_lock.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_log.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_mp.c -# End Source File -# Begin Source File - -SOURCE=..\tcl\tcl_txn.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_upgrade.dsp b/bdb/build_win32/db_upgrade.dsp deleted file mode 100644 index 4bb821f57e2..00000000000 --- a/bdb/build_win32/db_upgrade.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_upgrade" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_upgrade - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_upgrade.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_upgrade.mak" CFG="db_upgrade - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_upgrade - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_upgrade - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_upgrade - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_upgrade - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_upgrade - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_upgrade - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_upgrade - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_upgrade - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_upgrade - Win32 Release" -# Name "db_upgrade - Win32 Debug" -# Name "db_upgrade - Win32 Release Static" -# Name "db_upgrade - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_upgrade\db_upgrade.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/db_verify.dsp b/bdb/build_win32/db_verify.dsp deleted file mode 100644 index a8112364a83..00000000000 --- a/bdb/build_win32/db_verify.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="db_verify" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=db_verify - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "db_verify.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "db_verify.mak" CFG="db_verify - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "db_verify - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_verify - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_verify - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "db_verify - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "db_verify - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "db_verify - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "db_verify - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "db_verify - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "db_verify - Win32 Release" -# Name "db_verify - Win32 Debug" -# Name "db_verify - Win32 Release Static" -# Name "db_verify - Win32 Debug Static" -# Begin Source File - -SOURCE=..\db_verify\db_verify.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/ex_access.dsp b/bdb/build_win32/ex_access.dsp deleted file mode 100644 index 8c802b1d774..00000000000 --- a/bdb/build_win32/ex_access.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ex_access" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ex_access - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ex_access.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ex_access.mak" CFG="ex_access - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ex_access - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_access - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_access - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_access - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ex_access - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "ex_access - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "ex_access - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "ex_access - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "ex_access - Win32 Release" -# Name "ex_access - Win32 Debug" -# Name "ex_access - Win32 Release Static" -# Name "ex_access - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_c\ex_access.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/ex_btrec.dsp b/bdb/build_win32/ex_btrec.dsp deleted file mode 100644 index 08bc90752f5..00000000000 --- a/bdb/build_win32/ex_btrec.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ex_btrec" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ex_btrec - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ex_btrec.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ex_btrec.mak" CFG="ex_btrec - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ex_btrec - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_btrec - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_btrec - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_btrec - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ex_btrec - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "ex_btrec - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "ex_btrec - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "ex_btrec - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "ex_btrec - Win32 Release" -# Name "ex_btrec - Win32 Debug" -# Name "ex_btrec - Win32 Release Static" -# Name "ex_btrec - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_c\ex_btrec.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/ex_env.dsp b/bdb/build_win32/ex_env.dsp deleted file mode 100644 index a46e66dac27..00000000000 --- a/bdb/build_win32/ex_env.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ex_env" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ex_env - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ex_env.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ex_env.mak" CFG="ex_env - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ex_env - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_env - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_env - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_env - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ex_env - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "ex_env - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "ex_env - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "ex_env - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "ex_env - Win32 Release" -# Name "ex_env - Win32 Debug" -# Name "ex_env - Win32 Release Static" -# Name "ex_env - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_c\ex_env.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/ex_lock.dsp b/bdb/build_win32/ex_lock.dsp deleted file mode 100644 index 0fa57a960f8..00000000000 --- a/bdb/build_win32/ex_lock.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ex_lock" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ex_lock - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ex_lock.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ex_lock.mak" CFG="ex_lock - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ex_lock - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_lock - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_lock - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_lock - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ex_lock - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "ex_lock - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "ex_lock - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "ex_lock - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "ex_lock - Win32 Release" -# Name "ex_lock - Win32 Debug" -# Name "ex_lock - Win32 Release Static" -# Name "ex_lock - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_c\ex_lock.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/ex_mpool.dsp b/bdb/build_win32/ex_mpool.dsp deleted file mode 100644 index 3e2ee7205ce..00000000000 --- a/bdb/build_win32/ex_mpool.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ex_mpool" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ex_mpool - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ex_mpool.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ex_mpool.mak" CFG="ex_mpool - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ex_mpool - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_mpool - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_mpool - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_mpool - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ex_mpool - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "ex_mpool - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "ex_mpool - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "ex_mpool - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "ex_mpool - Win32 Release" -# Name "ex_mpool - Win32 Debug" -# Name "ex_mpool - Win32 Release Static" -# Name "ex_mpool - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_c\ex_mpool.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/ex_tpcb.dsp b/bdb/build_win32/ex_tpcb.dsp deleted file mode 100644 index fbaa67de7ac..00000000000 --- a/bdb/build_win32/ex_tpcb.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ex_tpcb" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=ex_tpcb - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ex_tpcb.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ex_tpcb.mak" CFG="ex_tpcb - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ex_tpcb - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_tpcb - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_tpcb - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "ex_tpcb - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ex_tpcb - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "ex_tpcb - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "ex_tpcb - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "ex_tpcb - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "ex_tpcb - Win32 Release" -# Name "ex_tpcb - Win32 Debug" -# Name "ex_tpcb - Win32 Release Static" -# Name "ex_tpcb - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_c\ex_tpcb.c -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/excxx_access.dsp b/bdb/build_win32/excxx_access.dsp deleted file mode 100644 index d93894dc5b7..00000000000 --- a/bdb/build_win32/excxx_access.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="excxx_access" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=excxx_access - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "excxx_access.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "excxx_access.mak" CFG="excxx_access - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "excxx_access - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_access - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_access - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_access - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "excxx_access - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "excxx_access - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "excxx_access - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "excxx_access - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "excxx_access - Win32 Release" -# Name "excxx_access - Win32 Debug" -# Name "excxx_access - Win32 Release Static" -# Name "excxx_access - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_cxx\AccessExample.cpp -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/excxx_btrec.dsp b/bdb/build_win32/excxx_btrec.dsp deleted file mode 100644 index 403e438a6e1..00000000000 --- a/bdb/build_win32/excxx_btrec.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="excxx_btrec" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=excxx_btrec - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "excxx_btrec.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "excxx_btrec.mak" CFG="excxx_btrec - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "excxx_btrec - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_btrec - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_btrec - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_btrec - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "excxx_btrec - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "excxx_btrec - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "excxx_btrec - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "excxx_btrec - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "excxx_btrec - Win32 Release" -# Name "excxx_btrec - Win32 Debug" -# Name "excxx_btrec - Win32 Release Static" -# Name "excxx_btrec - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_cxx\BtRecExample.cpp -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/excxx_env.dsp b/bdb/build_win32/excxx_env.dsp deleted file mode 100644 index 792358ee3ac..00000000000 --- a/bdb/build_win32/excxx_env.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="excxx_env" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=excxx_env - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "excxx_env.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "excxx_env.mak" CFG="excxx_env - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "excxx_env - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_env - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_env - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_env - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "excxx_env - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "excxx_env - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "excxx_env - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "excxx_env - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "excxx_env - Win32 Release" -# Name "excxx_env - Win32 Debug" -# Name "excxx_env - Win32 Release Static" -# Name "excxx_env - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_cxx\EnvExample.cpp -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/excxx_lock.dsp b/bdb/build_win32/excxx_lock.dsp deleted file mode 100644 index d35605cb412..00000000000 --- a/bdb/build_win32/excxx_lock.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="excxx_lock" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=excxx_lock - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "excxx_lock.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "excxx_lock.mak" CFG="excxx_lock - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "excxx_lock - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_lock - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_lock - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_lock - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "excxx_lock - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "excxx_lock - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "excxx_lock - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "excxx_lock - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "excxx_lock - Win32 Release" -# Name "excxx_lock - Win32 Debug" -# Name "excxx_lock - Win32 Release Static" -# Name "excxx_lock - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_cxx\LockExample.cpp -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/excxx_mpool.dsp b/bdb/build_win32/excxx_mpool.dsp deleted file mode 100644 index 2159e75bb9a..00000000000 --- a/bdb/build_win32/excxx_mpool.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="excxx_mpool" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=excxx_mpool - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "excxx_mpool.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "excxx_mpool.mak" CFG="excxx_mpool - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "excxx_mpool - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_mpool - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_mpool - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_mpool - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "excxx_mpool - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "excxx_mpool - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "excxx_mpool - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "excxx_mpool - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "excxx_mpool - Win32 Release" -# Name "excxx_mpool - Win32 Debug" -# Name "excxx_mpool - Win32 Release Static" -# Name "excxx_mpool - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_cxx\MpoolExample.cpp -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/build_win32/excxx_tpcb.dsp b/bdb/build_win32/excxx_tpcb.dsp deleted file mode 100644 index 9033daa6cfe..00000000000 --- a/bdb/build_win32/excxx_tpcb.dsp +++ /dev/null @@ -1,151 +0,0 @@ -# Microsoft Developer Studio Project File - Name="excxx_tpcb" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 5.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=excxx_tpcb - Win32 Debug Static -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "excxx_tpcb.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "excxx_tpcb.mak" CFG="excxx_tpcb - Win32 Debug Static" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "excxx_tpcb - Win32 Release" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_tpcb - Win32 Debug" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_tpcb - Win32 Release Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE "excxx_tpcb - Win32 Debug Static" (based on\ - "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "excxx_tpcb - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release/libdb32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libcmt" - -!ELSEIF "$(CFG)" == "excxx_tpcb - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 Debug/libdb32d.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /nodefaultlib:"libcmtd" /fixed:no - -!ELSEIF "$(CFG)" == "excxx_tpcb - Win32 Release Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release_static" -# PROP Intermediate_Dir "Release_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Release_static/libdb32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 Release_static/libdb32s.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "excxx_tpcb - Win32 Debug Static" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug_static" -# PROP Intermediate_Dir "Debug_static" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "." /I "../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 Debug_static/libdb32d.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no -# ADD LINK32 Debug_static/libdb32sd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /fixed:no - -!ENDIF - -# Begin Target - -# Name "excxx_tpcb - Win32 Release" -# Name "excxx_tpcb - Win32 Debug" -# Name "excxx_tpcb - Win32 Release Static" -# Name "excxx_tpcb - Win32 Debug Static" -# Begin Source File - -SOURCE=..\examples_cxx\TpcbExample.cpp -# End Source File -# Begin Source File - -SOURCE=..\clib\getopt.c -# End Source File -# End Target -# End Project diff --git a/bdb/dist/s_rpc b/bdb/dist/s_rpc index 88c9f47cbf4..f7d9cf4eb1c 100644 --- a/bdb/dist/s_rpc +++ b/bdb/dist/s_rpc @@ -55,8 +55,20 @@ rpcgen -c $xdr_file > $rpcxdr_file # Run server files through sed sed -f $svrsed_file $rpcsvc_file > ${rpcsvc_file}.new mv ${rpcsvc_file}.new $rpcsvc_file -sed -f $sed_file $proc_file > ${proc_file}.new -mv ${proc_file}.new $proc_file +# +# This is a hack to handle the $proc_file special case. Since it +# is both a source file and a generated file, we have to dance a +# bit to get it to work with 'bk get', not just with 'bk edit'. +# This still isn't perfect (I don't know what perfect would be in +# this case), but it seems to work for now. +# +#sed -f $sed_file $proc_file > ${proc_file}.new +#mv ${proc_file}.new $proc_file +# +mv $proc_file ${proc_file}.old +sed -f $sed_file ${proc_file}.old > $proc_file +test -w ${proc_file}.old || chmod a-w $proc_file +rm -f ${proc_file}.old # Run rpcgen files through sed to add HAVE_RPC ifdef sed -f $rpcsed_file $rpcsvc_file > ${rpcsvc_file}.new diff --git a/bdb/dist/template/.IGNORE_ME b/bdb/dist/template/.IGNORE_ME new file mode 100644 index 00000000000..558fd496f0c --- /dev/null +++ b/bdb/dist/template/.IGNORE_ME @@ -0,0 +1,3 @@ +Some combinations of the gzip and tar archive exploders found +on Linux systems ignore directories that don't have any files +(other than symbolic links) in them. So, here's a file. diff --git a/bdb/dist/template/db_server_proc b/bdb/dist/template/db_server_proc deleted file mode 100644 index 3fc73221817..00000000000 --- a/bdb/dist/template/db_server_proc +++ /dev/null @@ -1,1057 +0,0 @@ -/* Do not edit: automatically built by gen_rpc.awk. */ -#include "db_config.h" - -#ifndef NO_SYSTEM_INCLUDES -#include - -#include - -#include -#include -#include "db_server.h" -#endif - -#include "db_int.h" -#include "db_server_int.h" -#include "rpc_server_ext.h" - -#include "gen_server_ext.h" - -/* BEGIN __env_cachesize_1_proc */ -void -__env_cachesize_1_proc(dbenvcl_id, gbytes, bytes, - ncache, replyp) - long dbenvcl_id; - u_int32_t gbytes; - u_int32_t bytes; - u_int32_t ncache; - __env_cachesize_reply *replyp; -/* END __env_cachesize_1_proc */ -{ - int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __env_close_1_proc */ -void -__env_close_1_proc(dbenvcl_id, flags, replyp) - long dbenvcl_id; - u_int32_t flags; - __env_close_reply *replyp; -/* END __env_close_1_proc */ -{ - int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __env_create_1_proc */ -void -__env_create_1_proc(timeout, replyp) - u_int32_t timeout; - __env_create_reply *replyp; -/* END __env_create_1_proc */ -{ - int ret; - - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __env_flags_1_proc */ -void -__env_flags_1_proc(dbenvcl_id, flags, onoff, replyp) - long dbenvcl_id; - u_int32_t flags; - u_int32_t onoff; - __env_flags_reply *replyp; -/* END __env_flags_1_proc */ -{ - int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __env_open_1_proc */ -void -__env_open_1_proc(dbenvcl_id, home, flags, - mode, replyp) - long dbenvcl_id; - char *home; - u_int32_t flags; - u_int32_t mode; - __env_open_reply *replyp; -/* END __env_open_1_proc */ -{ - int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __env_remove_1_proc */ -void -__env_remove_1_proc(dbenvcl_id, home, flags, replyp) - long dbenvcl_id; - char *home; - u_int32_t flags; - __env_remove_reply *replyp; -/* END __env_remove_1_proc */ -{ - int ret; - DB_ENV * dbenv; - ct_entry *dbenv_ctp; - - ACTIVATE_CTP(dbenv_ctp, dbenvcl_id, CT_ENV); - dbenv = (DB_ENV *)dbenv_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __txn_abort_1_proc */ -void -__txn_abort_1_proc(txnpcl_id, replyp) - long txnpcl_id; - __txn_abort_reply *replyp; -/* END __txn_abort_1_proc */ -{ - int ret; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __txn_begin_1_proc */ -void -__txn_begin_1_proc(envpcl_id, parentcl_id, - flags, replyp) - long envpcl_id; - long parentcl_id; - u_int32_t flags; - __txn_begin_reply *replyp; -/* END __txn_begin_1_proc */ -{ - int ret; - DB_ENV * envp; - ct_entry *envp_ctp; - DB_TXN * parent; - ct_entry *parent_ctp; - - ACTIVATE_CTP(envp_ctp, envpcl_id, CT_ENV); - envp = (DB_ENV *)envp_ctp->ct_anyp; - ACTIVATE_CTP(parent_ctp, parentcl_id, CT_TXN); - parent = (DB_TXN *)parent_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __txn_commit_1_proc */ -void -__txn_commit_1_proc(txnpcl_id, flags, replyp) - long txnpcl_id; - u_int32_t flags; - __txn_commit_reply *replyp; -/* END __txn_commit_1_proc */ -{ - int ret; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_bt_maxkey_1_proc */ -void -__db_bt_maxkey_1_proc(dbpcl_id, maxkey, replyp) - long dbpcl_id; - u_int32_t maxkey; - __db_bt_maxkey_reply *replyp; -/* END __db_bt_maxkey_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_bt_minkey_1_proc */ -void -__db_bt_minkey_1_proc(dbpcl_id, minkey, replyp) - long dbpcl_id; - u_int32_t minkey; - __db_bt_minkey_reply *replyp; -/* END __db_bt_minkey_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_close_1_proc */ -void -__db_close_1_proc(dbpcl_id, flags, replyp) - long dbpcl_id; - u_int32_t flags; - __db_close_reply *replyp; -/* END __db_close_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_create_1_proc */ -void -__db_create_1_proc(flags, envpcl_id, replyp) - u_int32_t flags; - long envpcl_id; - __db_create_reply *replyp; -/* END __db_create_1_proc */ -{ - int ret; - DB_ENV * envp; - ct_entry *envp_ctp; - - ACTIVATE_CTP(envp_ctp, envpcl_id, CT_ENV); - envp = (DB_ENV *)envp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_del_1_proc */ -void -__db_del_1_proc(dbpcl_id, txnpcl_id, keydlen, - keydoff, keyflags, keydata, keysize, - flags, replyp) - long dbpcl_id; - long txnpcl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t flags; - __db_del_reply *replyp; -/* END __db_del_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_extentsize_1_proc */ -void -__db_extentsize_1_proc(dbpcl_id, extentsize, replyp) - long dbpcl_id; - u_int32_t extentsize; - __db_extentsize_reply *replyp; -/* END __db_extentsize_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_flags_1_proc */ -void -__db_flags_1_proc(dbpcl_id, flags, replyp) - long dbpcl_id; - u_int32_t flags; - __db_flags_reply *replyp; -/* END __db_flags_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_get_1_proc */ -void -__db_get_1_proc(dbpcl_id, txnpcl_id, keydlen, - keydoff, keyflags, keydata, keysize, - datadlen, datadoff, dataflags, datadata, - datasize, flags, replyp, freep) - long dbpcl_id; - long txnpcl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t datadlen; - u_int32_t datadoff; - u_int32_t dataflags; - void *datadata; - u_int32_t datasize; - u_int32_t flags; - __db_get_reply *replyp; - int * freep; -/* END __db_get_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_h_ffactor_1_proc */ -void -__db_h_ffactor_1_proc(dbpcl_id, ffactor, replyp) - long dbpcl_id; - u_int32_t ffactor; - __db_h_ffactor_reply *replyp; -/* END __db_h_ffactor_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_h_nelem_1_proc */ -void -__db_h_nelem_1_proc(dbpcl_id, nelem, replyp) - long dbpcl_id; - u_int32_t nelem; - __db_h_nelem_reply *replyp; -/* END __db_h_nelem_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_key_range_1_proc */ -void -__db_key_range_1_proc(dbpcl_id, txnpcl_id, keydlen, - keydoff, keyflags, keydata, keysize, - flags, replyp) - long dbpcl_id; - long txnpcl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t flags; - __db_key_range_reply *replyp; -/* END __db_key_range_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_lorder_1_proc */ -void -__db_lorder_1_proc(dbpcl_id, lorder, replyp) - long dbpcl_id; - u_int32_t lorder; - __db_lorder_reply *replyp; -/* END __db_lorder_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_open_1_proc */ -void -__db_open_1_proc(dbpcl_id, name, subdb, - type, flags, mode, replyp) - long dbpcl_id; - char *name; - char *subdb; - u_int32_t type; - u_int32_t flags; - u_int32_t mode; - __db_open_reply *replyp; -/* END __db_open_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_pagesize_1_proc */ -void -__db_pagesize_1_proc(dbpcl_id, pagesize, replyp) - long dbpcl_id; - u_int32_t pagesize; - __db_pagesize_reply *replyp; -/* END __db_pagesize_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_put_1_proc */ -void -__db_put_1_proc(dbpcl_id, txnpcl_id, keydlen, - keydoff, keyflags, keydata, keysize, - datadlen, datadoff, dataflags, datadata, - datasize, flags, replyp, freep) - long dbpcl_id; - long txnpcl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t datadlen; - u_int32_t datadoff; - u_int32_t dataflags; - void *datadata; - u_int32_t datasize; - u_int32_t flags; - __db_put_reply *replyp; - int * freep; -/* END __db_put_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_re_delim_1_proc */ -void -__db_re_delim_1_proc(dbpcl_id, delim, replyp) - long dbpcl_id; - u_int32_t delim; - __db_re_delim_reply *replyp; -/* END __db_re_delim_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_re_len_1_proc */ -void -__db_re_len_1_proc(dbpcl_id, len, replyp) - long dbpcl_id; - u_int32_t len; - __db_re_len_reply *replyp; -/* END __db_re_len_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_re_pad_1_proc */ -void -__db_re_pad_1_proc(dbpcl_id, pad, replyp) - long dbpcl_id; - u_int32_t pad; - __db_re_pad_reply *replyp; -/* END __db_re_pad_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_remove_1_proc */ -void -__db_remove_1_proc(dbpcl_id, name, subdb, - flags, replyp) - long dbpcl_id; - char *name; - char *subdb; - u_int32_t flags; - __db_remove_reply *replyp; -/* END __db_remove_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_rename_1_proc */ -void -__db_rename_1_proc(dbpcl_id, name, subdb, - newname, flags, replyp) - long dbpcl_id; - char *name; - char *subdb; - char *newname; - u_int32_t flags; - __db_rename_reply *replyp; -/* END __db_rename_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_stat_1_proc */ -void -__db_stat_1_proc(dbpcl_id, - flags, replyp, freep) - long dbpcl_id; - u_int32_t flags; - __db_stat_reply *replyp; - int * freep; -/* END __db_stat_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_swapped_1_proc */ -void -__db_swapped_1_proc(dbpcl_id, replyp) - long dbpcl_id; - __db_swapped_reply *replyp; -/* END __db_swapped_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_sync_1_proc */ -void -__db_sync_1_proc(dbpcl_id, flags, replyp) - long dbpcl_id; - u_int32_t flags; - __db_sync_reply *replyp; -/* END __db_sync_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_cursor_1_proc */ -void -__db_cursor_1_proc(dbpcl_id, txnpcl_id, - flags, replyp) - long dbpcl_id; - long txnpcl_id; - u_int32_t flags; - __db_cursor_reply *replyp; -/* END __db_cursor_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - DB_TXN * txnp; - ct_entry *txnp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - ACTIVATE_CTP(txnp_ctp, txnpcl_id, CT_TXN); - txnp = (DB_TXN *)txnp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __db_join_1_proc */ -void -__db_join_1_proc(dbpcl_id, curslist, - flags, replyp) - long dbpcl_id; - u_int32_t * curslist; - u_int32_t flags; - __db_join_reply *replyp; -/* END __db_join_1_proc */ -{ - int ret; - DB * dbp; - ct_entry *dbp_ctp; - - ACTIVATE_CTP(dbp_ctp, dbpcl_id, CT_DB); - dbp = (DB *)dbp_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __dbc_close_1_proc */ -void -__dbc_close_1_proc(dbccl_id, replyp) - long dbccl_id; - __dbc_close_reply *replyp; -/* END __dbc_close_1_proc */ -{ - int ret; - DBC * dbc; - ct_entry *dbc_ctp; - - ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR); - dbc = (DBC *)dbc_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __dbc_count_1_proc */ -void -__dbc_count_1_proc(dbccl_id, flags, replyp) - long dbccl_id; - u_int32_t flags; - __dbc_count_reply *replyp; -/* END __dbc_count_1_proc */ -{ - int ret; - DBC * dbc; - ct_entry *dbc_ctp; - - ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR); - dbc = (DBC *)dbc_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __dbc_del_1_proc */ -void -__dbc_del_1_proc(dbccl_id, flags, replyp) - long dbccl_id; - u_int32_t flags; - __dbc_del_reply *replyp; -/* END __dbc_del_1_proc */ -{ - int ret; - DBC * dbc; - ct_entry *dbc_ctp; - - ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR); - dbc = (DBC *)dbc_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __dbc_dup_1_proc */ -void -__dbc_dup_1_proc(dbccl_id, flags, replyp) - long dbccl_id; - u_int32_t flags; - __dbc_dup_reply *replyp; -/* END __dbc_dup_1_proc */ -{ - int ret; - DBC * dbc; - ct_entry *dbc_ctp; - - ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR); - dbc = (DBC *)dbc_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __dbc_get_1_proc */ -void -__dbc_get_1_proc(dbccl_id, keydlen, keydoff, - keyflags, keydata, keysize, datadlen, - datadoff, dataflags, datadata, datasize, - flags, replyp, freep) - long dbccl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t datadlen; - u_int32_t datadoff; - u_int32_t dataflags; - void *datadata; - u_int32_t datasize; - u_int32_t flags; - __dbc_get_reply *replyp; - int * freep; -/* END __dbc_get_1_proc */ -{ - int ret; - DBC * dbc; - ct_entry *dbc_ctp; - - ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR); - dbc = (DBC *)dbc_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - -/* BEGIN __dbc_put_1_proc */ -void -__dbc_put_1_proc(dbccl_id, keydlen, keydoff, - keyflags, keydata, keysize, datadlen, - datadoff, dataflags, datadata, datasize, - flags, replyp, freep) - long dbccl_id; - u_int32_t keydlen; - u_int32_t keydoff; - u_int32_t keyflags; - void *keydata; - u_int32_t keysize; - u_int32_t datadlen; - u_int32_t datadoff; - u_int32_t dataflags; - void *datadata; - u_int32_t datasize; - u_int32_t flags; - __dbc_put_reply *replyp; - int * freep; -/* END __dbc_put_1_proc */ -{ - int ret; - DBC * dbc; - ct_entry *dbc_ctp; - - ACTIVATE_CTP(dbc_ctp, dbccl_id, CT_CURSOR); - dbc = (DBC *)dbc_ctp->ct_anyp; - - /* - * XXX Code goes here - */ - - replyp->status = ret; - return; -} - diff --git a/bdb/dist/template/gen_client_ret b/bdb/dist/template/gen_client_ret deleted file mode 100644 index 81e14d8b27a..00000000000 --- a/bdb/dist/template/gen_client_ret +++ /dev/null @@ -1,522 +0,0 @@ -/* Do not edit: automatically built by gen_rpc.awk. */ -#include "db_config.h" - -#ifdef HAVE_RPC -#ifndef NO_SYSTEM_INCLUDES -#include -#include - -#include -#include -#endif -#include "db_server.h" - -#include "db_int.h" -#include "db_page.h" -#include "db_ext.h" -#include "txn.h" - -#include "gen_client_ext.h" - -int -__dbcl_env_close_ret(dbenv, flags, replyp) - DB_ENV * dbenv; - u_int32_t flags; - __env_close_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_env_open_ret(dbenv, home, flags, mode, replyp) - DB_ENV * dbenv; - const char * home; - u_int32_t flags; - int mode; - __env_open_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_env_remove_ret(dbenv, home, flags, replyp) - DB_ENV * dbenv; - const char * home; - u_int32_t flags; - __env_remove_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_txn_abort_ret(txnp, replyp) - DB_TXN * txnp; - __txn_abort_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_txn_begin_ret(envp, parent, txnpp, flags, replyp) - DB_ENV * envp; - DB_TXN * parent; - DB_TXN ** txnpp; - u_int32_t flags; - __txn_begin_reply *replyp; -{ - int ret; - long txnid; - - if (replyp->status != 0) - return (replyp->status); - txnid = replyp->txnidcl_id; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_txn_commit_ret(txnp, flags, replyp) - DB_TXN * txnp; - u_int32_t flags; - __txn_commit_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_close_ret(dbp, flags, replyp) - DB * dbp; - u_int32_t flags; - __db_close_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_get_ret(dbp, txnp, key, data, flags, replyp) - DB * dbp; - DB_TXN * txnp; - DBT * key; - DBT * data; - u_int32_t flags; - __db_get_reply *replyp; -{ - int ret; - /* DBT key; */ - /* DBT data; */ - - if (replyp->status != 0) - return (replyp->status); - /* Handle replyp->keydata; */ - /* Handle replyp->datadata; */ - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_key_range_ret(dbp, txnp, key, range, flags, replyp) - DB * dbp; - DB_TXN * txnp; - DBT * key; - DB_KEY_RANGE * range; - u_int32_t flags; - __db_key_range_reply *replyp; -{ - int ret; - double less; - double equal; - double greater; - - if (replyp->status != 0) - return (replyp->status); - less = replyp->less; - equal = replyp->equal; - greater = replyp->greater; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_open_ret(dbp, name, subdb, type, flags, mode, replyp) - DB * dbp; - const char * name; - const char * subdb; - DBTYPE type; - u_int32_t flags; - int mode; - __db_open_reply *replyp; -{ - int ret; - DBTYPE type; - u_int32_t dbflags; - - if (replyp->status != 0) - return (replyp->status); - type = replyp->type; - dbflags = replyp->dbflags; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_put_ret(dbp, txnp, key, data, flags, replyp) - DB * dbp; - DB_TXN * txnp; - DBT * key; - DBT * data; - u_int32_t flags; - __db_put_reply *replyp; -{ - int ret; - /* DBT key; */ - - if (replyp->status != 0) - return (replyp->status); - /* Handle replyp->keydata; */ - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_remove_ret(dbp, name, subdb, flags, replyp) - DB * dbp; - const char * name; - const char * subdb; - u_int32_t flags; - __db_remove_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_rename_ret(dbp, name, subdb, newname, flags, replyp) - DB * dbp; - const char * name; - const char * subdb; - const char * newname; - u_int32_t flags; - __db_rename_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int __db_db_stat_statsreplist __P((__db_stat_statsreplist, u_int32_t **)); -void __db_db_stat_statsfree __P((u_int32_t *)); - -int -__dbcl_db_stat_ret(dbp, sp, func0, flags, replyp) - DB * dbp; - void * sp; - void *(*func0) __P((size_t)); - u_int32_t flags; - __db_stat_reply *replyp; -{ - int ret; - u_int32_t *__db_statslist; - - if (replyp->status != 0) - return (replyp->status); - - if ((ret = __db_db_stat_statslist(replyp->statslist, &__db_statslist)) != 0) - return (ret); - - /* - * XXX Handle list - */ - - __db_db_stat_statsfree(__db_statslist); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__db_db_stat_statsreplist(locp, ppp) - __db_stat_statsreplist *locp; - u_int32_t **ppp; -{ - u_int32_t *pp; - int cnt, ret, size; - __db_stat_statsreplist *nl; - - for (cnt = 0, nl = locp; nl != NULL; cnt++, nl = nl->next) - ; - - if (cnt == 0) { - *ppp = NULL; - return (0); - } - size = sizeof(*pp) * cnt; - if ((ret = __os_malloc(NULL, size, NULL, ppp)) != 0) - return (ret); - memset(*ppp, 0, size); - for (pp = *ppp, nl = locp; nl != NULL; nl = nl->next, pp++) { - *pp = *(u_int32_t *)nl->ent.ent_val; - } - return (0); -out: - __db_db_stat_statsfree(*ppp); - return (ret); -} - -void -__db_db_stat_statsfree(pp) - u_int32_t *pp; -{ - size_t size; - u_int32_t *p; - - if (pp == NULL) - return; - size = sizeof(*p); - for (p = pp; *p != 0; p++) { - size += sizeof(*p); - } - __os_free(pp, size); -} - -int -__dbcl_db_cursor_ret(dbp, txnp, dbcpp, flags, replyp) - DB * dbp; - DB_TXN * txnp; - DBC ** dbcpp; - u_int32_t flags; - __db_cursor_reply *replyp; -{ - int ret; - long dbcid; - - if (replyp->status != 0) - return (replyp->status); - dbcid = replyp->dbcidcl_id; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_db_join_ret(dbp, curs, dbcp, flags, replyp) - DB * dbp; - DBC ** curs; - DBC ** dbcp; - u_int32_t flags; - __db_join_reply *replyp; -{ - int ret; - long dbcid; - - if (replyp->status != 0) - return (replyp->status); - dbcid = replyp->dbcidcl_id; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_dbc_close_ret(dbc, replyp) - DBC * dbc; - __dbc_close_reply *replyp; -{ - int ret; - - if (replyp->status != 0) - return (replyp->status); - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_dbc_count_ret(dbc, countp, flags, replyp) - DBC * dbc; - db_recno_t * countp; - u_int32_t flags; - __dbc_count_reply *replyp; -{ - int ret; - db_recno_t dupcount; - - if (replyp->status != 0) - return (replyp->status); - dupcount = replyp->dupcount; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_dbc_dup_ret(dbc, dbcp, flags, replyp) - DBC * dbc; - DBC ** dbcp; - u_int32_t flags; - __dbc_dup_reply *replyp; -{ - int ret; - long dbcid; - - if (replyp->status != 0) - return (replyp->status); - dbcid = replyp->dbcidcl_id; - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_dbc_get_ret(dbc, key, data, flags, replyp) - DBC * dbc; - DBT * key; - DBT * data; - u_int32_t flags; - __dbc_get_reply *replyp; -{ - int ret; - /* DBT key; */ - /* DBT data; */ - - if (replyp->status != 0) - return (replyp->status); - /* Handle replyp->keydata; */ - /* Handle replyp->datadata; */ - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -int -__dbcl_dbc_put_ret(dbc, key, data, flags, replyp) - DBC * dbc; - DBT * key; - DBT * data; - u_int32_t flags; - __dbc_put_reply *replyp; -{ - int ret; - /* DBT key; */ - - if (replyp->status != 0) - return (replyp->status); - /* Handle replyp->keydata; */ - - /* - * XXX Code goes here - */ - - return (replyp->status); -} - -#endif /* HAVE_RPC */ diff --git a/bdb/include/gen_client_ext.h b/bdb/include/gen_client_ext.h deleted file mode 100644 index 5675b74d3ec..00000000000 --- a/bdb/include/gen_client_ext.h +++ /dev/null @@ -1,121 +0,0 @@ -/* Do not edit: automatically built by gen_rpc.awk. */ -int __dbcl_env_cachesize __P((DB_ENV *, u_int32_t, u_int32_t, int)); -int __dbcl_env_close __P((DB_ENV *, u_int32_t)); -int __dbcl_env_close_ret __P((DB_ENV *, u_int32_t, __env_close_reply *)); -int __dbcl_rpc_illegal __P((DB_ENV *, char *)); -int __dbcl_set_data_dir __P((DB_ENV *, const char *)); -int __dbcl_env_set_feedback __P((DB_ENV *, void (*)(DB_ENV *, int, int))); -int __dbcl_env_flags __P((DB_ENV *, u_int32_t, int)); -int __dbcl_set_lg_bsize __P((DB_ENV *, u_int32_t)); -int __dbcl_set_lg_dir __P((DB_ENV *, const char *)); -int __dbcl_set_lg_max __P((DB_ENV *, u_int32_t)); -int __dbcl_set_lk_conflict __P((DB_ENV *, u_int8_t *, int)); -int __dbcl_set_lk_detect __P((DB_ENV *, u_int32_t)); -int __dbcl_set_lk_max __P((DB_ENV *, u_int32_t)); -int __dbcl_set_lk_max_locks __P((DB_ENV *, u_int32_t)); -int __dbcl_set_lk_max_lockers __P((DB_ENV *, u_int32_t)); -int __dbcl_set_lk_max_objects __P((DB_ENV *, u_int32_t)); -int __dbcl_set_mp_mmapsize __P((DB_ENV *, size_t)); -int __dbcl_set_mutex_locks __P((DB_ENV *, int)); -int __dbcl_env_open __P((DB_ENV *, const char *, u_int32_t, int)); -int __dbcl_env_open_ret __P((DB_ENV *, const char *, u_int32_t, int, __env_open_reply *)); -int __dbcl_env_paniccall __P((DB_ENV *, void (*)(DB_ENV *, int))); -int __dbcl_set_recovery_init __P((DB_ENV *, int (*)(DB_ENV *))); -int __dbcl_env_remove __P((DB_ENV *, const char *, u_int32_t)); -int __dbcl_env_remove_ret __P((DB_ENV *, const char *, u_int32_t, __env_remove_reply *)); -int __dbcl_set_shm_key __P((DB_ENV *, long)); -int __dbcl_set_tmp_dir __P((DB_ENV *, const char *)); -int __dbcl_set_tx_recover __P((DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops))); -int __dbcl_set_tx_max __P((DB_ENV *, u_int32_t)); -int __dbcl_set_tx_timestamp __P((DB_ENV *, time_t *)); -int __dbcl_set_verbose __P((DB_ENV *, u_int32_t, int)); -int __dbcl_txn_abort __P((DB_TXN *)); -int __dbcl_txn_abort_ret __P((DB_TXN *, __txn_abort_reply *)); -int __dbcl_txn_begin __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t)); -int __dbcl_txn_begin_ret __P((DB_ENV *, DB_TXN *, DB_TXN **, u_int32_t, __txn_begin_reply *)); -int __dbcl_txn_checkpoint __P((DB_ENV *, u_int32_t, u_int32_t)); -int __dbcl_txn_commit __P((DB_TXN *, u_int32_t)); -int __dbcl_txn_commit_ret __P((DB_TXN *, u_int32_t, __txn_commit_reply *)); -int __dbcl_txn_prepare __P((DB_TXN *)); -int __dbcl_txn_stat __P((DB_ENV *, DB_TXN_STAT **, void *(*)(size_t))); -int __dbcl_db_bt_compare __P((DB *, int (*)(DB *, const DBT *, const DBT *))); -int __dbcl_db_bt_maxkey __P((DB *, u_int32_t)); -int __dbcl_db_bt_minkey __P((DB *, u_int32_t)); -int __dbcl_db_bt_prefix __P((DB *, size_t(*)(DB *, const DBT *, const DBT *))); -int __dbcl_db_set_append_recno __P((DB *, int (*)(DB *, DBT *, db_recno_t))); -int __dbcl_db_cachesize __P((DB *, u_int32_t, u_int32_t, int)); -int __dbcl_db_close __P((DB *, u_int32_t)); -int __dbcl_db_close_ret __P((DB *, u_int32_t, __db_close_reply *)); -int __dbcl_db_del __P((DB *, DB_TXN *, DBT *, u_int32_t)); -int __dbcl_db_extentsize __P((DB *, u_int32_t)); -int __dbcl_db_fd __P((DB *, int *)); -int __dbcl_db_feedback __P((DB *, void (*)(DB *, int, int))); -int __dbcl_db_flags __P((DB *, u_int32_t)); -int __dbcl_db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t)); -int __dbcl_db_get_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_get_reply *)); -int __dbcl_db_h_ffactor __P((DB *, u_int32_t)); -int __dbcl_db_h_hash __P((DB *, u_int32_t(*)(DB *, const void *, u_int32_t))); -int __dbcl_db_h_nelem __P((DB *, u_int32_t)); -int __dbcl_db_key_range __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t)); -int __dbcl_db_key_range_ret __P((DB *, DB_TXN *, DBT *, DB_KEY_RANGE *, u_int32_t, __db_key_range_reply *)); -int __dbcl_db_lorder __P((DB *, int)); -int __dbcl_db_malloc __P((DB *, void *(*)(size_t))); -int __dbcl_db_open __P((DB *, const char *, const char *, DBTYPE, u_int32_t, int)); -int __dbcl_db_open_ret __P((DB *, const char *, const char *, DBTYPE, u_int32_t, int, __db_open_reply *)); -int __dbcl_db_pagesize __P((DB *, u_int32_t)); -int __dbcl_db_panic __P((DB *, void (*)(DB_ENV *, int))); -int __dbcl_db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t)); -int __dbcl_db_put_ret __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t, __db_put_reply *)); -int __dbcl_db_realloc __P((DB *, void *(*)(void *, size_t))); -int __dbcl_db_re_delim __P((DB *, int)); -int __dbcl_db_re_len __P((DB *, u_int32_t)); -int __dbcl_db_re_pad __P((DB *, int)); -int __dbcl_db_re_source __P((DB *, const char *)); -int __dbcl_db_remove __P((DB *, const char *, const char *, u_int32_t)); -int __dbcl_db_remove_ret __P((DB *, const char *, const char *, u_int32_t, __db_remove_reply *)); -int __dbcl_db_rename __P((DB *, const char *, const char *, const char *, u_int32_t)); -int __dbcl_db_rename_ret __P((DB *, const char *, const char *, const char *, u_int32_t, __db_rename_reply *)); -int __dbcl_db_stat __P((DB *, void *, void *(*)(size_t), u_int32_t)); -int __dbcl_db_stat_ret __P((DB *, void *, void *(*)(size_t), u_int32_t, __db_stat_reply *)); -int __dbcl_db_swapped __P((DB *)); -int __dbcl_db_sync __P((DB *, u_int32_t)); -int __dbcl_db_upgrade __P((DB *, const char *, u_int32_t)); -int __dbcl_db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t)); -int __dbcl_db_cursor_ret __P((DB *, DB_TXN *, DBC **, u_int32_t, __db_cursor_reply *)); -int __dbcl_db_join __P((DB *, DBC **, DBC **, u_int32_t)); -int __dbcl_db_join_ret __P((DB *, DBC **, DBC **, u_int32_t, __db_join_reply *)); -int __dbcl_dbc_close __P((DBC *)); -int __dbcl_dbc_close_ret __P((DBC *, __dbc_close_reply *)); -int __dbcl_dbc_count __P((DBC *, db_recno_t *, u_int32_t)); -int __dbcl_dbc_count_ret __P((DBC *, db_recno_t *, u_int32_t, __dbc_count_reply *)); -int __dbcl_dbc_del __P((DBC *, u_int32_t)); -int __dbcl_dbc_dup __P((DBC *, DBC **, u_int32_t)); -int __dbcl_dbc_dup_ret __P((DBC *, DBC **, u_int32_t, __dbc_dup_reply *)); -int __dbcl_dbc_get __P((DBC *, DBT *, DBT *, u_int32_t)); -int __dbcl_dbc_get_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_get_reply *)); -int __dbcl_dbc_put __P((DBC *, DBT *, DBT *, u_int32_t)); -int __dbcl_dbc_put_ret __P((DBC *, DBT *, DBT *, u_int32_t, __dbc_put_reply *)); -int __dbcl_lock_detect __P((DB_ENV *, u_int32_t, u_int32_t, int *)); -int __dbcl_lock_get __P((DB_ENV *, u_int32_t, u_int32_t, const DBT *, db_lockmode_t, DB_LOCK *)); -int __dbcl_lock_id __P((DB_ENV *, u_int32_t *)); -int __dbcl_lock_put __P((DB_ENV *, DB_LOCK *)); -int __dbcl_lock_stat __P((DB_ENV *, DB_LOCK_STAT **, void *(*)(size_t))); -int __dbcl_lock_vec __P((DB_ENV *, u_int32_t, u_int32_t, DB_LOCKREQ *, int, DB_LOCKREQ **)); -int __dbcl_log_archive __P((DB_ENV *, char ***, u_int32_t, void *(*)(size_t))); -int __dbcl_log_file __P((DB_ENV *, const DB_LSN *, char *, size_t)); -int __dbcl_log_flush __P((DB_ENV *, const DB_LSN *)); -int __dbcl_log_get __P((DB_ENV *, DB_LSN *, DBT *, u_int32_t)); -int __dbcl_log_put __P((DB_ENV *, DB_LSN *, const DBT *, u_int32_t)); -int __dbcl_log_register __P((DB_ENV *, DB *, const char *)); -int __dbcl_log_stat __P((DB_ENV *, DB_LOG_STAT **, void *(*)(size_t))); -int __dbcl_log_unregister __P((DB_ENV *, DB *)); -int __dbcl_memp_fclose __P((DB_MPOOLFILE *)); -int __dbcl_memp_fget __P((DB_MPOOLFILE *, db_pgno_t *, u_int32_t, void **)); -int __dbcl_memp_fopen __P((DB_ENV *, const char *, u_int32_t, int, size_t, DB_MPOOL_FINFO *, DB_MPOOLFILE **)); -int __dbcl_memp_fput __P((DB_MPOOLFILE *, void *, u_int32_t)); -int __dbcl_memp_fset __P((DB_MPOOLFILE *, void *, u_int32_t)); -int __dbcl_memp_fsync __P((DB_MPOOLFILE *)); -int __dbcl_memp_register __P((DB_ENV *, int, int (*)(DB_ENV *, db_pgno_t, void *, DBT *), int (*)(DB_ENV *, db_pgno_t, void *, DBT *))); -int __dbcl_memp_stat __P((DB_ENV *, DB_MPOOL_STAT **, DB_MPOOL_FSTAT ***, void *(*)(size_t))); -int __dbcl_memp_sync __P((DB_ENV *, DB_LSN *)); -int __dbcl_memp_trickle __P((DB_ENV *, int, int *)); diff --git a/bdb/include/gen_server_ext.h b/bdb/include/gen_server_ext.h deleted file mode 100644 index 9037d908f17..00000000000 --- a/bdb/include/gen_server_ext.h +++ /dev/null @@ -1,106 +0,0 @@ -/* Do not edit: automatically built by gen_rpc.awk. */ -__env_cachesize_reply * __db_env_cachesize_1 __P((__env_cachesize_msg *)); -void __env_cachesize_1_proc __P((long, u_int32_t, u_int32_t, - u_int32_t, __env_cachesize_reply *)); -__env_close_reply * __db_env_close_1 __P((__env_close_msg *)); -void __env_close_1_proc __P((long, u_int32_t, __env_close_reply *)); -__env_create_reply * __db_env_create_1 __P((__env_create_msg *)); -void __env_create_1_proc __P((u_int32_t, __env_create_reply *)); -__env_flags_reply * __db_env_flags_1 __P((__env_flags_msg *)); -void __env_flags_1_proc __P((long, u_int32_t, u_int32_t, __env_flags_reply *)); -__env_open_reply * __db_env_open_1 __P((__env_open_msg *)); -void __env_open_1_proc __P((long, char *, u_int32_t, - u_int32_t, __env_open_reply *)); -__env_remove_reply * __db_env_remove_1 __P((__env_remove_msg *)); -void __env_remove_1_proc __P((long, char *, u_int32_t, __env_remove_reply *)); -__txn_abort_reply * __db_txn_abort_1 __P((__txn_abort_msg *)); -void __txn_abort_1_proc __P((long, __txn_abort_reply *)); -__txn_begin_reply * __db_txn_begin_1 __P((__txn_begin_msg *)); -void __txn_begin_1_proc __P((long, long, - u_int32_t, __txn_begin_reply *)); -__txn_commit_reply * __db_txn_commit_1 __P((__txn_commit_msg *)); -void __txn_commit_1_proc __P((long, u_int32_t, __txn_commit_reply *)); -__db_bt_maxkey_reply * __db_db_bt_maxkey_1 __P((__db_bt_maxkey_msg *)); -void __db_bt_maxkey_1_proc __P((long, u_int32_t, __db_bt_maxkey_reply *)); -__db_bt_minkey_reply * __db_db_bt_minkey_1 __P((__db_bt_minkey_msg *)); -void __db_bt_minkey_1_proc __P((long, u_int32_t, __db_bt_minkey_reply *)); -__db_close_reply * __db_db_close_1 __P((__db_close_msg *)); -void __db_close_1_proc __P((long, u_int32_t, __db_close_reply *)); -__db_create_reply * __db_db_create_1 __P((__db_create_msg *)); -void __db_create_1_proc __P((u_int32_t, long, __db_create_reply *)); -__db_del_reply * __db_db_del_1 __P((__db_del_msg *)); -void __db_del_1_proc __P((long, long, u_int32_t, - u_int32_t, u_int32_t, void *, u_int32_t, - u_int32_t, __db_del_reply *)); -__db_extentsize_reply * __db_db_extentsize_1 __P((__db_extentsize_msg *)); -void __db_extentsize_1_proc __P((long, u_int32_t, __db_extentsize_reply *)); -__db_flags_reply * __db_db_flags_1 __P((__db_flags_msg *)); -void __db_flags_1_proc __P((long, u_int32_t, __db_flags_reply *)); -__db_get_reply * __db_db_get_1 __P((__db_get_msg *)); -void __db_get_1_proc __P((long, long, u_int32_t, - u_int32_t, u_int32_t, void *, u_int32_t, - u_int32_t, u_int32_t, u_int32_t, void *, - u_int32_t, u_int32_t, __db_get_reply *, int *)); -__db_h_ffactor_reply * __db_db_h_ffactor_1 __P((__db_h_ffactor_msg *)); -void __db_h_ffactor_1_proc __P((long, u_int32_t, __db_h_ffactor_reply *)); -__db_h_nelem_reply * __db_db_h_nelem_1 __P((__db_h_nelem_msg *)); -void __db_h_nelem_1_proc __P((long, u_int32_t, __db_h_nelem_reply *)); -__db_key_range_reply * __db_db_key_range_1 __P((__db_key_range_msg *)); -void __db_key_range_1_proc __P((long, long, u_int32_t, - u_int32_t, u_int32_t, void *, u_int32_t, - u_int32_t, __db_key_range_reply *)); -__db_lorder_reply * __db_db_lorder_1 __P((__db_lorder_msg *)); -void __db_lorder_1_proc __P((long, u_int32_t, __db_lorder_reply *)); -__db_open_reply * __db_db_open_1 __P((__db_open_msg *)); -void __db_open_1_proc __P((long, char *, char *, - u_int32_t, u_int32_t, u_int32_t, __db_open_reply *)); -__db_pagesize_reply * __db_db_pagesize_1 __P((__db_pagesize_msg *)); -void __db_pagesize_1_proc __P((long, u_int32_t, __db_pagesize_reply *)); -__db_put_reply * __db_db_put_1 __P((__db_put_msg *)); -void __db_put_1_proc __P((long, long, u_int32_t, - u_int32_t, u_int32_t, void *, u_int32_t, - u_int32_t, u_int32_t, u_int32_t, void *, - u_int32_t, u_int32_t, __db_put_reply *, int *)); -__db_re_delim_reply * __db_db_re_delim_1 __P((__db_re_delim_msg *)); -void __db_re_delim_1_proc __P((long, u_int32_t, __db_re_delim_reply *)); -__db_re_len_reply * __db_db_re_len_1 __P((__db_re_len_msg *)); -void __db_re_len_1_proc __P((long, u_int32_t, __db_re_len_reply *)); -__db_re_pad_reply * __db_db_re_pad_1 __P((__db_re_pad_msg *)); -void __db_re_pad_1_proc __P((long, u_int32_t, __db_re_pad_reply *)); -__db_remove_reply * __db_db_remove_1 __P((__db_remove_msg *)); -void __db_remove_1_proc __P((long, char *, char *, - u_int32_t, __db_remove_reply *)); -__db_rename_reply * __db_db_rename_1 __P((__db_rename_msg *)); -void __db_rename_1_proc __P((long, char *, char *, - char *, u_int32_t, __db_rename_reply *)); -__db_stat_reply * __db_db_stat_1 __P((__db_stat_msg *)); -void __db_stat_1_proc __P((long, - u_int32_t, __db_stat_reply *, int *)); -__db_swapped_reply * __db_db_swapped_1 __P((__db_swapped_msg *)); -void __db_swapped_1_proc __P((long, __db_swapped_reply *)); -__db_sync_reply * __db_db_sync_1 __P((__db_sync_msg *)); -void __db_sync_1_proc __P((long, u_int32_t, __db_sync_reply *)); -__db_cursor_reply * __db_db_cursor_1 __P((__db_cursor_msg *)); -void __db_cursor_1_proc __P((long, long, - u_int32_t, __db_cursor_reply *)); -__db_join_reply * __db_db_join_1 __P((__db_join_msg *)); -void __db_join_1_proc __P((long, u_int32_t *, - u_int32_t, __db_join_reply *)); -__dbc_close_reply * __db_dbc_close_1 __P((__dbc_close_msg *)); -void __dbc_close_1_proc __P((long, __dbc_close_reply *)); -__dbc_count_reply * __db_dbc_count_1 __P((__dbc_count_msg *)); -void __dbc_count_1_proc __P((long, u_int32_t, __dbc_count_reply *)); -__dbc_del_reply * __db_dbc_del_1 __P((__dbc_del_msg *)); -void __dbc_del_1_proc __P((long, u_int32_t, __dbc_del_reply *)); -__dbc_dup_reply * __db_dbc_dup_1 __P((__dbc_dup_msg *)); -void __dbc_dup_1_proc __P((long, u_int32_t, __dbc_dup_reply *)); -__dbc_get_reply * __db_dbc_get_1 __P((__dbc_get_msg *)); -void __dbc_get_1_proc __P((long, u_int32_t, u_int32_t, - u_int32_t, void *, u_int32_t, u_int32_t, - u_int32_t, u_int32_t, void *, u_int32_t, - u_int32_t, __dbc_get_reply *, int *)); -__dbc_put_reply * __db_dbc_put_1 __P((__dbc_put_msg *)); -void __dbc_put_1_proc __P((long, u_int32_t, u_int32_t, - u_int32_t, void *, u_int32_t, u_int32_t, - u_int32_t, u_int32_t, void *, u_int32_t, - u_int32_t, __dbc_put_reply *, int *)); diff --git a/bdb/rpc_server/db_server.x b/bdb/rpc_server/db_server.x deleted file mode 100644 index 6bdff201f5a..00000000000 --- a/bdb/rpc_server/db_server.x +++ /dev/null @@ -1,492 +0,0 @@ -/* Do not edit: automatically built by gen_rpc.awk. */ - -struct __env_cachesize_msg { - unsigned int dbenvcl_id; - unsigned int gbytes; - unsigned int bytes; - unsigned int ncache; -}; - -struct __env_cachesize_reply { - unsigned int status; -}; - -struct __env_close_msg { - unsigned int dbenvcl_id; - unsigned int flags; -}; - -struct __env_close_reply { - unsigned int status; -}; - -struct __env_create_msg { - unsigned int timeout; -}; - -struct __env_create_reply { - unsigned int status; - unsigned int envcl_id; -}; - -struct __env_flags_msg { - unsigned int dbenvcl_id; - unsigned int flags; - unsigned int onoff; -}; - -struct __env_flags_reply { - unsigned int status; -}; - -struct __env_open_msg { - unsigned int dbenvcl_id; - string home<>; - unsigned int flags; - unsigned int mode; -}; - -struct __env_open_reply { - unsigned int status; -}; - -struct __env_remove_msg { - unsigned int dbenvcl_id; - string home<>; - unsigned int flags; -}; - -struct __env_remove_reply { - unsigned int status; -}; - -struct __txn_abort_msg { - unsigned int txnpcl_id; -}; - -struct __txn_abort_reply { - unsigned int status; -}; - -struct __txn_begin_msg { - unsigned int envpcl_id; - unsigned int parentcl_id; - unsigned int flags; -}; - -struct __txn_begin_reply { - unsigned int status; - unsigned int txnidcl_id; -}; - -struct __txn_commit_msg { - unsigned int txnpcl_id; - unsigned int flags; -}; - -struct __txn_commit_reply { - unsigned int status; -}; - -struct __db_bt_maxkey_msg { - unsigned int dbpcl_id; - unsigned int maxkey; -}; - -struct __db_bt_maxkey_reply { - unsigned int status; -}; - -struct __db_bt_minkey_msg { - unsigned int dbpcl_id; - unsigned int minkey; -}; - -struct __db_bt_minkey_reply { - unsigned int status; -}; - -struct __db_close_msg { - unsigned int dbpcl_id; - unsigned int flags; -}; - -struct __db_close_reply { - unsigned int status; -}; - -struct __db_create_msg { - unsigned int flags; - unsigned int envpcl_id; -}; - -struct __db_create_reply { - unsigned int status; - unsigned int dbpcl_id; -}; - -struct __db_del_msg { - unsigned int dbpcl_id; - unsigned int txnpcl_id; - unsigned int keydlen; - unsigned int keydoff; - unsigned int keyflags; - opaque keydata<>; - unsigned int flags; -}; - -struct __db_del_reply { - unsigned int status; -}; - -struct __db_extentsize_msg { - unsigned int dbpcl_id; - unsigned int extentsize; -}; - -struct __db_extentsize_reply { - unsigned int status; -}; - -struct __db_flags_msg { - unsigned int dbpcl_id; - unsigned int flags; -}; - -struct __db_flags_reply { - unsigned int status; -}; - -struct __db_get_msg { - unsigned int dbpcl_id; - unsigned int txnpcl_id; - unsigned int keydlen; - unsigned int keydoff; - unsigned int keyflags; - opaque keydata<>; - unsigned int datadlen; - unsigned int datadoff; - unsigned int dataflags; - opaque datadata<>; - unsigned int flags; -}; - -struct __db_get_reply { - unsigned int status; - opaque keydata<>; - opaque datadata<>; -}; - -struct __db_h_ffactor_msg { - unsigned int dbpcl_id; - unsigned int ffactor; -}; - -struct __db_h_ffactor_reply { - unsigned int status; -}; - -struct __db_h_nelem_msg { - unsigned int dbpcl_id; - unsigned int nelem; -}; - -struct __db_h_nelem_reply { - unsigned int status; -}; - -struct __db_key_range_msg { - unsigned int dbpcl_id; - unsigned int txnpcl_id; - unsigned int keydlen; - unsigned int keydoff; - unsigned int keyflags; - opaque keydata<>; - unsigned int flags; -}; - -struct __db_key_range_reply { - unsigned int status; - double less; - double equal; - double greater; -}; - -struct __db_lorder_msg { - unsigned int dbpcl_id; - unsigned int lorder; -}; - -struct __db_lorder_reply { - unsigned int status; -}; - -struct __db_open_msg { - unsigned int dbpcl_id; - string name<>; - string subdb<>; - unsigned int type; - unsigned int flags; - unsigned int mode; -}; - -struct __db_open_reply { - unsigned int status; - unsigned int type; - unsigned int dbflags; -}; - -struct __db_pagesize_msg { - unsigned int dbpcl_id; - unsigned int pagesize; -}; - -struct __db_pagesize_reply { - unsigned int status; -}; - -struct __db_put_msg { - unsigned int dbpcl_id; - unsigned int txnpcl_id; - unsigned int keydlen; - unsigned int keydoff; - unsigned int keyflags; - opaque keydata<>; - unsigned int datadlen; - unsigned int datadoff; - unsigned int dataflags; - opaque datadata<>; - unsigned int flags; -}; - -struct __db_put_reply { - unsigned int status; - opaque keydata<>; -}; - -struct __db_re_delim_msg { - unsigned int dbpcl_id; - unsigned int delim; -}; - -struct __db_re_delim_reply { - unsigned int status; -}; - -struct __db_re_len_msg { - unsigned int dbpcl_id; - unsigned int len; -}; - -struct __db_re_len_reply { - unsigned int status; -}; - -struct __db_re_pad_msg { - unsigned int dbpcl_id; - unsigned int pad; -}; - -struct __db_re_pad_reply { - unsigned int status; -}; - -struct __db_remove_msg { - unsigned int dbpcl_id; - string name<>; - string subdb<>; - unsigned int flags; -}; - -struct __db_remove_reply { - unsigned int status; -}; - -struct __db_rename_msg { - unsigned int dbpcl_id; - string name<>; - string subdb<>; - string newname<>; - unsigned int flags; -}; - -struct __db_rename_reply { - unsigned int status; -}; - -struct __db_stat_msg { - unsigned int dbpcl_id; - unsigned int flags; -}; - -struct __db_stat_statsreplist { - opaque ent<>; - __db_stat_statsreplist *next; -}; - -struct __db_stat_reply { - unsigned int status; - __db_stat_statsreplist *statslist; -}; - -struct __db_swapped_msg { - unsigned int dbpcl_id; -}; - -struct __db_swapped_reply { - unsigned int status; -}; - -struct __db_sync_msg { - unsigned int dbpcl_id; - unsigned int flags; -}; - -struct __db_sync_reply { - unsigned int status; -}; - -struct __db_cursor_msg { - unsigned int dbpcl_id; - unsigned int txnpcl_id; - unsigned int flags; -}; - -struct __db_cursor_reply { - unsigned int status; - unsigned int dbcidcl_id; -}; - -struct __db_join_curslist { - opaque ent<>; - __db_join_curslist *next; -}; - -struct __db_join_msg { - unsigned int dbpcl_id; - __db_join_curslist *curslist; - unsigned int flags; -}; - -struct __db_join_reply { - unsigned int status; - unsigned int dbcidcl_id; -}; - -struct __dbc_close_msg { - unsigned int dbccl_id; -}; - -struct __dbc_close_reply { - unsigned int status; -}; - -struct __dbc_count_msg { - unsigned int dbccl_id; - unsigned int flags; -}; - -struct __dbc_count_reply { - unsigned int status; - unsigned int dupcount; -}; - -struct __dbc_del_msg { - unsigned int dbccl_id; - unsigned int flags; -}; - -struct __dbc_del_reply { - unsigned int status; -}; - -struct __dbc_dup_msg { - unsigned int dbccl_id; - unsigned int flags; -}; - -struct __dbc_dup_reply { - unsigned int status; - unsigned int dbcidcl_id; -}; - -struct __dbc_get_msg { - unsigned int dbccl_id; - unsigned int keydlen; - unsigned int keydoff; - unsigned int keyflags; - opaque keydata<>; - unsigned int datadlen; - unsigned int datadoff; - unsigned int dataflags; - opaque datadata<>; - unsigned int flags; -}; - -struct __dbc_get_reply { - unsigned int status; - opaque keydata<>; - opaque datadata<>; -}; - -struct __dbc_put_msg { - unsigned int dbccl_id; - unsigned int keydlen; - unsigned int keydoff; - unsigned int keyflags; - opaque keydata<>; - unsigned int datadlen; - unsigned int datadoff; - unsigned int dataflags; - opaque datadata<>; - unsigned int flags; -}; - -struct __dbc_put_reply { - unsigned int status; - opaque keydata<>; -}; -program DB_SERVERPROG { - version DB_SERVERVERS { - __env_cachesize_reply __DB_env_cachesize(__env_cachesize_msg) = 1; - __env_close_reply __DB_env_close(__env_close_msg) = 2; - __env_create_reply __DB_env_create(__env_create_msg) = 3; - __env_flags_reply __DB_env_flags(__env_flags_msg) = 4; - __env_open_reply __DB_env_open(__env_open_msg) = 5; - __env_remove_reply __DB_env_remove(__env_remove_msg) = 6; - __txn_abort_reply __DB_txn_abort(__txn_abort_msg) = 7; - __txn_begin_reply __DB_txn_begin(__txn_begin_msg) = 8; - __txn_commit_reply __DB_txn_commit(__txn_commit_msg) = 9; - __db_bt_maxkey_reply __DB_db_bt_maxkey(__db_bt_maxkey_msg) = 10; - __db_bt_minkey_reply __DB_db_bt_minkey(__db_bt_minkey_msg) = 11; - __db_close_reply __DB_db_close(__db_close_msg) = 12; - __db_create_reply __DB_db_create(__db_create_msg) = 13; - __db_del_reply __DB_db_del(__db_del_msg) = 14; - __db_extentsize_reply __DB_db_extentsize(__db_extentsize_msg) = 15; - __db_flags_reply __DB_db_flags(__db_flags_msg) = 16; - __db_get_reply __DB_db_get(__db_get_msg) = 17; - __db_h_ffactor_reply __DB_db_h_ffactor(__db_h_ffactor_msg) = 18; - __db_h_nelem_reply __DB_db_h_nelem(__db_h_nelem_msg) = 19; - __db_key_range_reply __DB_db_key_range(__db_key_range_msg) = 20; - __db_lorder_reply __DB_db_lorder(__db_lorder_msg) = 21; - __db_open_reply __DB_db_open(__db_open_msg) = 22; - __db_pagesize_reply __DB_db_pagesize(__db_pagesize_msg) = 23; - __db_put_reply __DB_db_put(__db_put_msg) = 24; - __db_re_delim_reply __DB_db_re_delim(__db_re_delim_msg) = 25; - __db_re_len_reply __DB_db_re_len(__db_re_len_msg) = 26; - __db_re_pad_reply __DB_db_re_pad(__db_re_pad_msg) = 27; - __db_remove_reply __DB_db_remove(__db_remove_msg) = 28; - __db_rename_reply __DB_db_rename(__db_rename_msg) = 29; - __db_stat_reply __DB_db_stat(__db_stat_msg) = 30; - __db_swapped_reply __DB_db_swapped(__db_swapped_msg) = 31; - __db_sync_reply __DB_db_sync(__db_sync_msg) = 32; - __db_cursor_reply __DB_db_cursor(__db_cursor_msg) = 33; - __db_join_reply __DB_db_join(__db_join_msg) = 34; - __dbc_close_reply __DB_dbc_close(__dbc_close_msg) = 35; - __dbc_count_reply __DB_dbc_count(__dbc_count_msg) = 36; - __dbc_del_reply __DB_dbc_del(__dbc_del_msg) = 37; - __dbc_dup_reply __DB_dbc_dup(__dbc_dup_msg) = 38; - __dbc_get_reply __DB_dbc_get(__dbc_get_msg) = 39; - __dbc_put_reply __DB_dbc_put(__dbc_put_msg) = 40; - } = 1; -} = 351457; diff --git a/bdb/rpc_server/db_server_proc.sed b/bdb/rpc_server/db_server_proc.sed deleted file mode 100644 index 7266275b2b6..00000000000 --- a/bdb/rpc_server/db_server_proc.sed +++ /dev/null @@ -1,418 +0,0 @@ -/^\/\* BEGIN __env_cachesize_1_proc/,/^\/\* END __env_cachesize_1_proc/c\ -/* BEGIN __env_cachesize_1_proc */\ -void\ -__env_cachesize_1_proc(dbenvcl_id, gbytes, bytes,\ -\ \ ncache, replyp)\ -\ long dbenvcl_id;\ -\ u_int32_t gbytes;\ -\ u_int32_t bytes;\ -\ u_int32_t ncache;\ -\ __env_cachesize_reply *replyp;\ -/* END __env_cachesize_1_proc */ -/^\/\* BEGIN __env_close_1_proc/,/^\/\* END __env_close_1_proc/c\ -/* BEGIN __env_close_1_proc */\ -void\ -__env_close_1_proc(dbenvcl_id, flags, replyp)\ -\ long dbenvcl_id;\ -\ u_int32_t flags;\ -\ __env_close_reply *replyp;\ -/* END __env_close_1_proc */ -/^\/\* BEGIN __env_create_1_proc/,/^\/\* END __env_create_1_proc/c\ -/* BEGIN __env_create_1_proc */\ -void\ -__env_create_1_proc(timeout, replyp)\ -\ u_int32_t timeout;\ -\ __env_create_reply *replyp;\ -/* END __env_create_1_proc */ -/^\/\* BEGIN __env_flags_1_proc/,/^\/\* END __env_flags_1_proc/c\ -/* BEGIN __env_flags_1_proc */\ -void\ -__env_flags_1_proc(dbenvcl_id, flags, onoff, replyp)\ -\ long dbenvcl_id;\ -\ u_int32_t flags;\ -\ u_int32_t onoff;\ -\ __env_flags_reply *replyp;\ -/* END __env_flags_1_proc */ -/^\/\* BEGIN __env_open_1_proc/,/^\/\* END __env_open_1_proc/c\ -/* BEGIN __env_open_1_proc */\ -void\ -__env_open_1_proc(dbenvcl_id, home, flags,\ -\ \ mode, replyp)\ -\ long dbenvcl_id;\ -\ char *home;\ -\ u_int32_t flags;\ -\ u_int32_t mode;\ -\ __env_open_reply *replyp;\ -/* END __env_open_1_proc */ -/^\/\* BEGIN __env_remove_1_proc/,/^\/\* END __env_remove_1_proc/c\ -/* BEGIN __env_remove_1_proc */\ -void\ -__env_remove_1_proc(dbenvcl_id, home, flags, replyp)\ -\ long dbenvcl_id;\ -\ char *home;\ -\ u_int32_t flags;\ -\ __env_remove_reply *replyp;\ -/* END __env_remove_1_proc */ -/^\/\* BEGIN __txn_abort_1_proc/,/^\/\* END __txn_abort_1_proc/c\ -/* BEGIN __txn_abort_1_proc */\ -void\ -__txn_abort_1_proc(txnpcl_id, replyp)\ -\ long txnpcl_id;\ -\ __txn_abort_reply *replyp;\ -/* END __txn_abort_1_proc */ -/^\/\* BEGIN __txn_begin_1_proc/,/^\/\* END __txn_begin_1_proc/c\ -/* BEGIN __txn_begin_1_proc */\ -void\ -__txn_begin_1_proc(envpcl_id, parentcl_id,\ -\ \ flags, replyp)\ -\ long envpcl_id;\ -\ long parentcl_id;\ -\ u_int32_t flags;\ -\ __txn_begin_reply *replyp;\ -/* END __txn_begin_1_proc */ -/^\/\* BEGIN __txn_commit_1_proc/,/^\/\* END __txn_commit_1_proc/c\ -/* BEGIN __txn_commit_1_proc */\ -void\ -__txn_commit_1_proc(txnpcl_id, flags, replyp)\ -\ long txnpcl_id;\ -\ u_int32_t flags;\ -\ __txn_commit_reply *replyp;\ -/* END __txn_commit_1_proc */ -/^\/\* BEGIN __db_bt_maxkey_1_proc/,/^\/\* END __db_bt_maxkey_1_proc/c\ -/* BEGIN __db_bt_maxkey_1_proc */\ -void\ -__db_bt_maxkey_1_proc(dbpcl_id, maxkey, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t maxkey;\ -\ __db_bt_maxkey_reply *replyp;\ -/* END __db_bt_maxkey_1_proc */ -/^\/\* BEGIN __db_bt_minkey_1_proc/,/^\/\* END __db_bt_minkey_1_proc/c\ -/* BEGIN __db_bt_minkey_1_proc */\ -void\ -__db_bt_minkey_1_proc(dbpcl_id, minkey, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t minkey;\ -\ __db_bt_minkey_reply *replyp;\ -/* END __db_bt_minkey_1_proc */ -/^\/\* BEGIN __db_close_1_proc/,/^\/\* END __db_close_1_proc/c\ -/* BEGIN __db_close_1_proc */\ -void\ -__db_close_1_proc(dbpcl_id, flags, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t flags;\ -\ __db_close_reply *replyp;\ -/* END __db_close_1_proc */ -/^\/\* BEGIN __db_create_1_proc/,/^\/\* END __db_create_1_proc/c\ -/* BEGIN __db_create_1_proc */\ -void\ -__db_create_1_proc(flags, envpcl_id, replyp)\ -\ u_int32_t flags;\ -\ long envpcl_id;\ -\ __db_create_reply *replyp;\ -/* END __db_create_1_proc */ -/^\/\* BEGIN __db_del_1_proc/,/^\/\* END __db_del_1_proc/c\ -/* BEGIN __db_del_1_proc */\ -void\ -__db_del_1_proc(dbpcl_id, txnpcl_id, keydlen,\ -\ \ keydoff, keyflags, keydata, keysize,\ -\ \ flags, replyp)\ -\ long dbpcl_id;\ -\ long txnpcl_id;\ -\ u_int32_t keydlen;\ -\ u_int32_t keydoff;\ -\ u_int32_t keyflags;\ -\ void *keydata;\ -\ u_int32_t keysize;\ -\ u_int32_t flags;\ -\ __db_del_reply *replyp;\ -/* END __db_del_1_proc */ -/^\/\* BEGIN __db_extentsize_1_proc/,/^\/\* END __db_extentsize_1_proc/c\ -/* BEGIN __db_extentsize_1_proc */\ -void\ -__db_extentsize_1_proc(dbpcl_id, extentsize, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t extentsize;\ -\ __db_extentsize_reply *replyp;\ -/* END __db_extentsize_1_proc */ -/^\/\* BEGIN __db_flags_1_proc/,/^\/\* END __db_flags_1_proc/c\ -/* BEGIN __db_flags_1_proc */\ -void\ -__db_flags_1_proc(dbpcl_id, flags, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t flags;\ -\ __db_flags_reply *replyp;\ -/* END __db_flags_1_proc */ -/^\/\* BEGIN __db_get_1_proc/,/^\/\* END __db_get_1_proc/c\ -/* BEGIN __db_get_1_proc */\ -void\ -__db_get_1_proc(dbpcl_id, txnpcl_id, keydlen,\ -\ \ keydoff, keyflags, keydata, keysize,\ -\ \ datadlen, datadoff, dataflags, datadata,\ -\ \ datasize, flags, replyp, freep)\ -\ long dbpcl_id;\ -\ long txnpcl_id;\ -\ u_int32_t keydlen;\ -\ u_int32_t keydoff;\ -\ u_int32_t keyflags;\ -\ void *keydata;\ -\ u_int32_t keysize;\ -\ u_int32_t datadlen;\ -\ u_int32_t datadoff;\ -\ u_int32_t dataflags;\ -\ void *datadata;\ -\ u_int32_t datasize;\ -\ u_int32_t flags;\ -\ __db_get_reply *replyp;\ -\ int * freep;\ -/* END __db_get_1_proc */ -/^\/\* BEGIN __db_h_ffactor_1_proc/,/^\/\* END __db_h_ffactor_1_proc/c\ -/* BEGIN __db_h_ffactor_1_proc */\ -void\ -__db_h_ffactor_1_proc(dbpcl_id, ffactor, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t ffactor;\ -\ __db_h_ffactor_reply *replyp;\ -/* END __db_h_ffactor_1_proc */ -/^\/\* BEGIN __db_h_nelem_1_proc/,/^\/\* END __db_h_nelem_1_proc/c\ -/* BEGIN __db_h_nelem_1_proc */\ -void\ -__db_h_nelem_1_proc(dbpcl_id, nelem, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t nelem;\ -\ __db_h_nelem_reply *replyp;\ -/* END __db_h_nelem_1_proc */ -/^\/\* BEGIN __db_key_range_1_proc/,/^\/\* END __db_key_range_1_proc/c\ -/* BEGIN __db_key_range_1_proc */\ -void\ -__db_key_range_1_proc(dbpcl_id, txnpcl_id, keydlen,\ -\ \ keydoff, keyflags, keydata, keysize,\ -\ \ flags, replyp)\ -\ long dbpcl_id;\ -\ long txnpcl_id;\ -\ u_int32_t keydlen;\ -\ u_int32_t keydoff;\ -\ u_int32_t keyflags;\ -\ void *keydata;\ -\ u_int32_t keysize;\ -\ u_int32_t flags;\ -\ __db_key_range_reply *replyp;\ -/* END __db_key_range_1_proc */ -/^\/\* BEGIN __db_lorder_1_proc/,/^\/\* END __db_lorder_1_proc/c\ -/* BEGIN __db_lorder_1_proc */\ -void\ -__db_lorder_1_proc(dbpcl_id, lorder, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t lorder;\ -\ __db_lorder_reply *replyp;\ -/* END __db_lorder_1_proc */ -/^\/\* BEGIN __db_open_1_proc/,/^\/\* END __db_open_1_proc/c\ -/* BEGIN __db_open_1_proc */\ -void\ -__db_open_1_proc(dbpcl_id, name, subdb,\ -\ \ type, flags, mode, replyp)\ -\ long dbpcl_id;\ -\ char *name;\ -\ char *subdb;\ -\ u_int32_t type;\ -\ u_int32_t flags;\ -\ u_int32_t mode;\ -\ __db_open_reply *replyp;\ -/* END __db_open_1_proc */ -/^\/\* BEGIN __db_pagesize_1_proc/,/^\/\* END __db_pagesize_1_proc/c\ -/* BEGIN __db_pagesize_1_proc */\ -void\ -__db_pagesize_1_proc(dbpcl_id, pagesize, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t pagesize;\ -\ __db_pagesize_reply *replyp;\ -/* END __db_pagesize_1_proc */ -/^\/\* BEGIN __db_put_1_proc/,/^\/\* END __db_put_1_proc/c\ -/* BEGIN __db_put_1_proc */\ -void\ -__db_put_1_proc(dbpcl_id, txnpcl_id, keydlen,\ -\ \ keydoff, keyflags, keydata, keysize,\ -\ \ datadlen, datadoff, dataflags, datadata,\ -\ \ datasize, flags, replyp, freep)\ -\ long dbpcl_id;\ -\ long txnpcl_id;\ -\ u_int32_t keydlen;\ -\ u_int32_t keydoff;\ -\ u_int32_t keyflags;\ -\ void *keydata;\ -\ u_int32_t keysize;\ -\ u_int32_t datadlen;\ -\ u_int32_t datadoff;\ -\ u_int32_t dataflags;\ -\ void *datadata;\ -\ u_int32_t datasize;\ -\ u_int32_t flags;\ -\ __db_put_reply *replyp;\ -\ int * freep;\ -/* END __db_put_1_proc */ -/^\/\* BEGIN __db_re_delim_1_proc/,/^\/\* END __db_re_delim_1_proc/c\ -/* BEGIN __db_re_delim_1_proc */\ -void\ -__db_re_delim_1_proc(dbpcl_id, delim, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t delim;\ -\ __db_re_delim_reply *replyp;\ -/* END __db_re_delim_1_proc */ -/^\/\* BEGIN __db_re_len_1_proc/,/^\/\* END __db_re_len_1_proc/c\ -/* BEGIN __db_re_len_1_proc */\ -void\ -__db_re_len_1_proc(dbpcl_id, len, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t len;\ -\ __db_re_len_reply *replyp;\ -/* END __db_re_len_1_proc */ -/^\/\* BEGIN __db_re_pad_1_proc/,/^\/\* END __db_re_pad_1_proc/c\ -/* BEGIN __db_re_pad_1_proc */\ -void\ -__db_re_pad_1_proc(dbpcl_id, pad, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t pad;\ -\ __db_re_pad_reply *replyp;\ -/* END __db_re_pad_1_proc */ -/^\/\* BEGIN __db_remove_1_proc/,/^\/\* END __db_remove_1_proc/c\ -/* BEGIN __db_remove_1_proc */\ -void\ -__db_remove_1_proc(dbpcl_id, name, subdb,\ -\ \ flags, replyp)\ -\ long dbpcl_id;\ -\ char *name;\ -\ char *subdb;\ -\ u_int32_t flags;\ -\ __db_remove_reply *replyp;\ -/* END __db_remove_1_proc */ -/^\/\* BEGIN __db_rename_1_proc/,/^\/\* END __db_rename_1_proc/c\ -/* BEGIN __db_rename_1_proc */\ -void\ -__db_rename_1_proc(dbpcl_id, name, subdb,\ -\ \ newname, flags, replyp)\ -\ long dbpcl_id;\ -\ char *name;\ -\ char *subdb;\ -\ char *newname;\ -\ u_int32_t flags;\ -\ __db_rename_reply *replyp;\ -/* END __db_rename_1_proc */ -/^\/\* BEGIN __db_stat_1_proc/,/^\/\* END __db_stat_1_proc/c\ -/* BEGIN __db_stat_1_proc */\ -void\ -__db_stat_1_proc(dbpcl_id,\ -\ \ flags, replyp, freep)\ -\ long dbpcl_id;\ -\ u_int32_t flags;\ -\ __db_stat_reply *replyp;\ -\ int * freep;\ -/* END __db_stat_1_proc */ -/^\/\* BEGIN __db_swapped_1_proc/,/^\/\* END __db_swapped_1_proc/c\ -/* BEGIN __db_swapped_1_proc */\ -void\ -__db_swapped_1_proc(dbpcl_id, replyp)\ -\ long dbpcl_id;\ -\ __db_swapped_reply *replyp;\ -/* END __db_swapped_1_proc */ -/^\/\* BEGIN __db_sync_1_proc/,/^\/\* END __db_sync_1_proc/c\ -/* BEGIN __db_sync_1_proc */\ -void\ -__db_sync_1_proc(dbpcl_id, flags, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t flags;\ -\ __db_sync_reply *replyp;\ -/* END __db_sync_1_proc */ -/^\/\* BEGIN __db_cursor_1_proc/,/^\/\* END __db_cursor_1_proc/c\ -/* BEGIN __db_cursor_1_proc */\ -void\ -__db_cursor_1_proc(dbpcl_id, txnpcl_id,\ -\ \ flags, replyp)\ -\ long dbpcl_id;\ -\ long txnpcl_id;\ -\ u_int32_t flags;\ -\ __db_cursor_reply *replyp;\ -/* END __db_cursor_1_proc */ -/^\/\* BEGIN __db_join_1_proc/,/^\/\* END __db_join_1_proc/c\ -/* BEGIN __db_join_1_proc */\ -void\ -__db_join_1_proc(dbpcl_id, curslist,\ -\ \ flags, replyp)\ -\ long dbpcl_id;\ -\ u_int32_t * curslist;\ -\ u_int32_t flags;\ -\ __db_join_reply *replyp;\ -/* END __db_join_1_proc */ -/^\/\* BEGIN __dbc_close_1_proc/,/^\/\* END __dbc_close_1_proc/c\ -/* BEGIN __dbc_close_1_proc */\ -void\ -__dbc_close_1_proc(dbccl_id, replyp)\ -\ long dbccl_id;\ -\ __dbc_close_reply *replyp;\ -/* END __dbc_close_1_proc */ -/^\/\* BEGIN __dbc_count_1_proc/,/^\/\* END __dbc_count_1_proc/c\ -/* BEGIN __dbc_count_1_proc */\ -void\ -__dbc_count_1_proc(dbccl_id, flags, replyp)\ -\ long dbccl_id;\ -\ u_int32_t flags;\ -\ __dbc_count_reply *replyp;\ -/* END __dbc_count_1_proc */ -/^\/\* BEGIN __dbc_del_1_proc/,/^\/\* END __dbc_del_1_proc/c\ -/* BEGIN __dbc_del_1_proc */\ -void\ -__dbc_del_1_proc(dbccl_id, flags, replyp)\ -\ long dbccl_id;\ -\ u_int32_t flags;\ -\ __dbc_del_reply *replyp;\ -/* END __dbc_del_1_proc */ -/^\/\* BEGIN __dbc_dup_1_proc/,/^\/\* END __dbc_dup_1_proc/c\ -/* BEGIN __dbc_dup_1_proc */\ -void\ -__dbc_dup_1_proc(dbccl_id, flags, replyp)\ -\ long dbccl_id;\ -\ u_int32_t flags;\ -\ __dbc_dup_reply *replyp;\ -/* END __dbc_dup_1_proc */ -/^\/\* BEGIN __dbc_get_1_proc/,/^\/\* END __dbc_get_1_proc/c\ -/* BEGIN __dbc_get_1_proc */\ -void\ -__dbc_get_1_proc(dbccl_id, keydlen, keydoff,\ -\ \ keyflags, keydata, keysize, datadlen,\ -\ \ datadoff, dataflags, datadata, datasize,\ -\ \ flags, replyp, freep)\ -\ long dbccl_id;\ -\ u_int32_t keydlen;\ -\ u_int32_t keydoff;\ -\ u_int32_t keyflags;\ -\ void *keydata;\ -\ u_int32_t keysize;\ -\ u_int32_t datadlen;\ -\ u_int32_t datadoff;\ -\ u_int32_t dataflags;\ -\ void *datadata;\ -\ u_int32_t datasize;\ -\ u_int32_t flags;\ -\ __dbc_get_reply *replyp;\ -\ int * freep;\ -/* END __dbc_get_1_proc */ -/^\/\* BEGIN __dbc_put_1_proc/,/^\/\* END __dbc_put_1_proc/c\ -/* BEGIN __dbc_put_1_proc */\ -void\ -__dbc_put_1_proc(dbccl_id, keydlen, keydoff,\ -\ \ keyflags, keydata, keysize, datadlen,\ -\ \ datadoff, dataflags, datadata, datasize,\ -\ \ flags, replyp, freep)\ -\ long dbccl_id;\ -\ u_int32_t keydlen;\ -\ u_int32_t keydoff;\ -\ u_int32_t keyflags;\ -\ void *keydata;\ -\ u_int32_t keysize;\ -\ u_int32_t datadlen;\ -\ u_int32_t datadoff;\ -\ u_int32_t dataflags;\ -\ void *datadata;\ -\ u_int32_t datasize;\ -\ u_int32_t flags;\ -\ __dbc_put_reply *replyp;\ -\ int * freep;\ -/* END __dbc_put_1_proc */ diff --git a/bdb/test/logtrack.list b/bdb/test/logtrack.list deleted file mode 100644 index ba7f34a6d13..00000000000 --- a/bdb/test/logtrack.list +++ /dev/null @@ -1,68 +0,0 @@ -PREFIX crdel -BEGIN fileopen 141 -BEGIN metasub 142 -BEGIN metapage 143 -DEPRECATED old_delete 144 -BEGIN rename 145 -BEGIN delete 146 -PREFIX db -BEGIN addrem 41 -DEPRECATED split 42 -BEGIN big 43 -BEGIN ovref 44 -BEGIN relink 45 -DEPRECATED addpage 46 -BEGIN debug 47 -BEGIN noop 48 -PREFIX bam -BEGIN pg_alloc 51 -DEPRECATED pg_alloc1 60 -BEGIN pg_free 52 -DEPRECATED pg_free1 61 -DEPRECATED split1 53 -BEGIN split 62 -DEPRECATED rsplit1 54 -BEGIN rsplit 63 -BEGIN adj 55 -BEGIN cadjust 56 -BEGIN cdel 57 -BEGIN repl 58 -BEGIN root 59 -BEGIN curadj 64 -BEGIN rcuradj 65 -PREFIX ham -BEGIN insdel 21 -BEGIN newpage 22 -DEPRECATED splitmeta 23 -BEGIN splitdata 24 -BEGIN replace 25 -DEPRECATED newpgno 26 -DEPRECATED ovfl 27 -BEGIN copypage 28 -BEGIN metagroup 29 -DEPRECATED groupalloc1 30 -DEPRECATED groupalloc2 31 -BEGIN groupalloc 32 -BEGIN curadj 33 -BEGIN chgpg 34 -PREFIX log -DEPRECATED register1 1 -BEGIN register 2 -PREFIX qam -BEGIN inc 76 -BEGIN incfirst 77 -BEGIN mvptr 78 -BEGIN del 79 -BEGIN add 80 -BEGIN delete 81 -BEGIN rename 82 -BEGIN delext 83 -PREFIX txn -DEPRECATED old_regop 6 -BEGIN regop 10 -DEPRECATED old_ckp 7 -BEGIN ckp 11 -DEPRECATED xa_regop_old 8 -BEGIN xa_regop 13 -DEPRECATED child_old 9 -BEGIN child 12 From d43a78a443ed34266c219c707048818b695205a3 Mon Sep 17 00:00:00 2001 From: "tim@threads.polyesthetic.msg" <> Date: Fri, 18 May 2001 12:44:35 -0400 Subject: [PATCH 20/24] manual.texi @[XXX] -> @{[XXX]} (syntax error) --- Docs/manual.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 76cf02a40ff..9fd5498834b 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -33013,7 +33013,7 @@ Temporary directory (instead of /tmp). You can use 'perldoc mysqlhotcopy' to get a more complete documentation for @code{mysqlhotcopy}. -@code{mysqlhotcopy} reads the groups @code[client] and @code{[mysqlhotcopy]} +@code{mysqlhotcopy} reads the groups @code{[client]} and @code{[mysqlhotcopy]} from the option files. To be able to execute @code{mysqlhotcopy} you need write access to the From bf13a2b338dce0f626506807b11c3db8545e5069 Mon Sep 17 00:00:00 2001 From: "tim@work.mysql.com" <> Date: Fri, 18 May 2001 18:48:38 +0200 Subject: [PATCH 21/24] Do-patch-file Fix typo (extra 'mv') ignore added Logs/* binary/* --- .bzrignore | 2 ++ BitKeeper/etc/logging_ok | 1 + Build-tools/Do-patch-file | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.bzrignore b/.bzrignore index 502efd1f30a..cb630b66ae7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -248,3 +248,5 @@ innobase/ib_config.h innobase/ib_config.h.in mysql.proj client/mysqlcheck +Logs/* +binary/* diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 8bf83e5a369..d2ed3990f36 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ mwagner@evoq.mwagner.org +tim@work.mysql.com diff --git a/Build-tools/Do-patch-file b/Build-tools/Do-patch-file index 68003962c56..975c10c6b0e 100755 --- a/Build-tools/Do-patch-file +++ b/Build-tools/Do-patch-file @@ -40,5 +40,5 @@ chmod a+r,o-w $RESULT binary/* mv $RESULT $PATCH_DIR cp binary/mysqlcom-* binary/mysql*win* /net/web/home/production/data/nweb/customer/Downloads rm binary/mysqlcom-* -mv binary/*Max* mv binary/*-max* $RESULT_DIR_MAX +mv binary/*Max* binary/*-max* $RESULT_DIR_MAX cp binary/* $RESULT_DIR From 1805de7011d89040fc2a64aadbfbb522c2ecc770 Mon Sep 17 00:00:00 2001 From: "heikki@donna.mysql.fi" <> Date: Fri, 18 May 2001 21:20:03 +0300 Subject: [PATCH 22/24] ibuf0ibuf.c Insert buffer calculated SQL NULL size wrong, causing overflow and assertion failure in some cases log0log.c Retrieve a dummy value from a function to prevent gcc crashing on HP-UX --- BitKeeper/etc/logging_ok | 1 + innobase/ibuf/ibuf0ibuf.c | 30 +++++++++++++++++++++++------- innobase/log/log0log.c | 3 ++- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 07cc0180ae3..4f6442327a6 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ mwagner@evoq.mwagner.org tim@threads.polyesthetic.msg tim@work.mysql.com +heikki@donna.mysql.fi diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index 960ceb666f1..7227b54e71e 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -1002,24 +1002,40 @@ ibuf_rec_get_volume( /*================*/ /* out: size of index record in bytes + an upper limit of the space taken in the page directory */ - rec_t* rec) /* in: ibuf record */ + rec_t* ibuf_rec)/* in: ibuf record */ { + dtype_t dtype; + ulint data_size = 0; ulint n_fields; - byte* field; + byte* types; + byte* data; ulint len; - ulint data_size; + ulint i; ut_ad(ibuf_inside()); ut_ad(rec_get_n_fields(rec) > 2); + + n_fields = rec_get_n_fields(ibuf_rec) - 2; - n_fields = rec_get_n_fields(rec) - 2; + types = rec_get_nth_field(ibuf_rec, 1, &len); - field = rec_get_nth_field(rec, 2, &len); + ut_ad(len == n_fields * DATA_ORDER_NULL_TYPE_BUF_SIZE); - data_size = rec_get_data_size(rec) - (field - rec); + for (i = 0; i < n_fields; i++) { + data = rec_get_nth_field(ibuf_rec, i + 2, &len); + + dtype_read_for_order_and_null_size(&dtype, + types + i * DATA_ORDER_NULL_TYPE_BUF_SIZE); + + if (len == UNIV_SQL_NULL) { + data_size += dtype_get_sql_null_size(&dtype); + } else { + data_size += len; + } + } return(data_size + rec_get_converted_extra_size(data_size, n_fields) - + page_dir_calc_reserved_space(1)); + + page_dir_calc_reserved_space(1)); } /************************************************************************* diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c index ced7ce17679..32e7f144026 100644 --- a/innobase/log/log0log.c +++ b/innobase/log/log0log.c @@ -327,7 +327,8 @@ log_pad_current_log_block(void) ulint i; dulint lsn; - log_reserve_and_open(OS_FILE_LOG_BLOCK_SIZE); + /* We retrieve lsn only because otherwise gcc crashed on HP-UX */ + lsn = log_reserve_and_open(OS_FILE_LOG_BLOCK_SIZE); pad_length = OS_FILE_LOG_BLOCK_SIZE - (log_sys->buf_free % OS_FILE_LOG_BLOCK_SIZE) From ed5841ae65f4b7ba9aaef08a113ea7d6911baa18 Mon Sep 17 00:00:00 2001 From: "paul@central.snake.net" <> Date: Fri, 18 May 2001 23:05:33 -0500 Subject: [PATCH 23/24] manual.texi more development tree section changes manual.texi change "InnoDB consinsten read" to manual.texi "InnoDB consistent read" in @node lines manual.texi (to match section's actual title) manual.texi cleanups to "installing from development source manual.texi tree" section --- BitKeeper/etc/logging_ok | 1 + Docs/manual.texi | 109 ++++++++++++++++++++++----------------- 2 files changed, 62 insertions(+), 48 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 4f6442327a6..c6de835b33a 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -2,3 +2,4 @@ mwagner@evoq.mwagner.org tim@threads.polyesthetic.msg tim@work.mysql.com heikki@donna.mysql.fi +paul@central.snake.net diff --git a/Docs/manual.texi b/Docs/manual.texi index 70352d2872d..549d06e2361 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -561,7 +561,7 @@ Backing up and recovering an InnoDB database InnoDB transaction model -* InnoDB consinsten read:: +* InnoDB consistent read:: * InnoDB locking reads:: * InnoDB Next-key locking:: * InnoDB Locks set:: @@ -6457,19 +6457,18 @@ system-specific sections later in this chapter. @end itemize @node Installing source tree, Compilation problems, Installing source, Installing -@section Installing from development source tree +@section Installing from the Development Source Tree @cindex development source tree @cindex BitKeeper tree @cindex cvs tree -@strong{CAUTION:} You should only read this section if you are -interested in helping us test our new code. If you just want to get -@strong{MySQL} up and running on your system, you should use either -source or binary distribution. +@strong{CAUTION:} You should read this section only if you are interested +in helping us test our new code. If you just want to get @strong{MySQL} up +and running on your system, you should use a standard release distribution +(either a source or binary distribution will do). -Below are the instructions to obtain our most recent development -source tree: +To obtain our most recent development source tree, use these instructions: @enumerate @item @@ -6481,62 +6480,76 @@ Download @strong{BitKeeper} from Follow the instructions to install it. @item -Once @strong{BitKeeper} is installed, if you want to clone 3.23 branch, -@code{bk clone bk://work.mysql.com:7000 mysql}, and -@code{bk clone bk://work.mysql.com:7001 mysql-4.0} for 4.0 branch. - -The initial download may take a while, depending on the speed of your -connection. - -@item -You will need GNU autoconf, automake, libtool, and m4 to do the next stage. -If you get some strange error during the first stage, check that you really -have libtool installed! +After @strong{BitKeeper} is installed, use this command if you want to clone +the @strong{MySQL} 3.23 branch: @example -cd mysql -bk -r edit -aclocal; autoheader; autoconf; automake; -./configure # Add your favorite options here -make +shell> bk clone bk://work.mysql.com:7000 mysql @end example -We have a collection of our standard configure scripts in the @file{BUILD/} -subdirectory. If you are lazy, you can use +To clone the 4.0 branch, use this command instead: + +@example +shell> bk clone bk://work.mysql.com:7001 mysql-4.0 +@end example + +The initial download of the source tree may take a while, depending on the +speed of your connection; be patient. + +@item +You will need GNU @code{autoconf}, @code{automake}, @code{libtool}, and +@code{m4} to run the next set of commands. +If you get some strange error during this stage, check that you really +have @code{libtool} installed! + +@example +shell> cd mysql +shell> bk -r edit +shell> aclocal; autoheader; autoconf; automake; +shell> ./configure # Add your favorite options here +shell> make +@end example + +A collection of our standard configure scripts is located in the +@file{BUILD/} subdirectory. If you are lazy, you can use @file{BUILD/compile-pentium-debug}. It will actually work on a lot of non-x86 machines despite its name. @item -Once the build is done, @code{make install}. Be careful with this on -a production machine - this may overwrite your live release binary. We -recommend that if you have another installation of @strong{MySQL} that -you @code{./configure} with different values for @code{prefix}, -@code{tcp-port}, and @code{unix-socket-path}. +When the build is done, run @code{make install}. Be careful with this +on a production machine; the command may overwrite your live release +installation. If you have another installation of @strong{MySQL}, we +recommand that you run @code{./configure} with different values for the +@code{prefix}, @code{tcp-port}, and @code{unix-socket-path} options than +those used for your production server. @item Play hard with your new installation and try to make the new features crash. Start by running @code{make test}. @xref{MySQL test suite}. @item -If you have gotten to the @code{make} stage and it does not compile, -please report it to @email{bugs@@lists.mysql.com}. If you have -installed the latest version of the required GNU tools, and they crash -trying to process our configuration files, please report it also. However, -if you execute @code{aclocal} and get @code{command not found}, or a -similar problem, do not report it, make sure all the needed tools are -installed and your @code{PATH} variable is set correctly. +If you have gotten to the @code{make} stage and the distribution does +not compile, please report it to @email{bugs@@lists.mysql.com}. If you +have installed the latest versions of the required GNU tools, and they +crash trying to process our configuration files, please report that also. +However, if you execute @code{aclocal} and get a @code{command not found} +error or a similar problem, do not report it. Instead, make sure all +the necessary tools are installed and that your @code{PATH} variable is +set correctly so your shell can find them. @item -After the initial @code{bk clone}, do @code{bk pull} to get the updates. +After the initial @code{bk clone} operation to get the source tree, you +should run @code{bk pull} periodically to get the updates. @item -You can examine change history of the tree with all the diffs with +You can examine the change history for the tree with all the diffs by using @code{bk sccstool}. If you see some funny diffs or code that you have a -question about, do not hesitate and e-mail @email{internals@@lists.mysql.com}. -Also if you think you have a better idea on how to do something, send an email -to the same place with a patch. @code{bk diffs} will produce a patch for you -after you have made changes to the source. If you do not have the time to code -your idea, just send a description. +question about, do not hesitate to send e-mail to +@email{internals@@lists.mysql.com}. Also, if you think you have a better idea +on how to do something, send an email to the same address with a patch. +@code{bk diffs} will produce a patch for you after you have made changes +to the source. If you do not have the time to code your idea, just send +a description. @item @strong{BitKeeper} has a nice help utility that you can access via @@ -25110,14 +25123,14 @@ on the other hand cancels all modifications made by the current transaction. @menu -* InnoDB consinsten read:: +* InnoDB consistent read:: * InnoDB locking reads:: * InnoDB Next-key locking:: * InnoDB Locks set:: * InnoDB Deadlock detection:: @end menu -@node InnoDB consinsten read, InnoDB locking reads, InnoDB transaction model, InnoDB transaction model +@node InnoDB consistent read, InnoDB locking reads, InnoDB transaction model, InnoDB transaction model @subsubsection Consistent read A consistent read means that InnoDB uses its multiversioning to @@ -25142,7 +25155,7 @@ on the tables it accesses, and therefore other users are free to modify those tables at the same time a consistent read is being performed on the table. -@node InnoDB locking reads, InnoDB Next-key locking, InnoDB consinsten read, InnoDB transaction model +@node InnoDB locking reads, InnoDB Next-key locking, InnoDB consistent read, InnoDB transaction model @subsubsection Locking reads A consistent read is not convenient in some circumstances. From 25a129c96f11b20bb359ea460d3c0d5dc99e214e Mon Sep 17 00:00:00 2001 From: "monty@donna.mysql.fi" <> Date: Sat, 19 May 2001 10:14:05 +0300 Subject: [PATCH 24/24] Force close of sockets on HPUX 10.20 Support option lines longer than 256 chars. Close the slow log at shutdown. Always allow debug options to mysqld. Change some DBUG_PRINT tags. --- Docs/manual.texi | 20 ++++++++++---------- configure.in | 10 +++++----- mysql-test/t/merge.test | 1 + mysys/default.c | 2 +- mysys/mf_keycache.c | 4 ++-- sql/mysqld.cc | 17 +++++++---------- sql/violite.c | 6 +++--- 7 files changed, 29 insertions(+), 31 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index 76cf02a40ff..2bdc3311733 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -10265,9 +10265,10 @@ the priority of only one query, or by thread. @xref{Table locking}. @item --memlock -Lock the @code{mysqld} process in memory. This works only if your system -supports the @code{mlockall()} system call. This may help if you have -a problem where the operating system is causing @code{mysqld} to swap on disk. +Lock the @code{mysqld} process in memory. This works only if your +system supports the @code{mlockall()} system call (like Solaris). This +may help if you have a problem where the operating system is causing +@code{mysqld} to swap on disk. @item --myisam-recover [=option[,option...]]] where option is one of DEFAULT, BACKUP, FORCE or QUICK. If this option is used, @code{mysqld} will on open check if the table is @@ -33010,10 +33011,10 @@ Flush logs once all tables are locked. Temporary directory (instead of /tmp). @end table -You can use 'perldoc mysqlhotcopy' to get a more complete documentation for -@code{mysqlhotcopy}. +You can use @code{perldoc mysqlhotcopy} to get a more complete +documentation for @code{mysqlhotcopy}. -@code{mysqlhotcopy} reads the groups @code[client] and @code{[mysqlhotcopy]} +@code{mysqlhotcopy} reads the groups @code{client} and @code{mysqlhotcopy} from the option files. To be able to execute @code{mysqlhotcopy} you need write access to the @@ -44400,6 +44401,8 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.39 @itemize @bullet @item +Extended argument length in option files from 256 to 512 chars. +@item Fixed problem with shutdown when @code{INSERT DELAYED} was waiting for a @code{LOCK TABLE}. @item @@ -50385,10 +50388,7 @@ On some operating systems, the error log will contain a stack trace if @code{mysqld} dies unexpectedly. You can use this to find out where (and maybe why) @code{mysqld} died. @xref{Error log}. To get a stack trace, you should NOT compile @code{mysqld} with the @code{-fomit-frame-pointer} -option to gcc. On Linux-x86 you can use -@code{-fomit-frame-pointer -ffixed-ebp} to get both speed and a reasonable -accurate stack trace. -@xref{Compiling for debugging}. +option to gcc. @xref{Compiling for debugging}. If the error file contains something like the following: diff --git a/configure.in b/configure.in index 021f25308d8..9998902bcec 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.38) +AM_INIT_AUTOMAKE(mysql, 3.23.39) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -751,8 +751,8 @@ case $SYSTEM_TYPE in ;; *hpux10.20*) echo "Enabling snprintf workaround for hpux 10.20" - CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF" - CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG" + CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ" + CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ" ;; *hpux11.*) echo "Enabling pread/pwrite workaround for hpux 11" @@ -806,8 +806,8 @@ case $SYSTEM_TYPE in ;; *aix4.3*) echo "Adding defines for AIX" - CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS" - CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS" + CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ" + CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ" ;; dnl Is this the right match for DEC OSF on alpha? *dec-osf*) diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 619ec1d58af..59da525990c 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -109,3 +109,4 @@ insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6); insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6); flush tables; select * from t3 where a=1 order by b limit 2; +drop table t1,t2,t3; diff --git a/mysys/default.c b/mysys/default.c index 6518fb5816f..cb842da0f02 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -222,7 +222,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, const char *dir, const char *config_file, const char *ext, TYPELIB *group) { - char name[FN_REFLEN+10],buff[257],*ptr,*end,*value,*tmp; + char name[FN_REFLEN+10],buff[FN_REFLEN+1],*ptr,*end,*value,*tmp; FILE *fp; uint line=0; my_bool read_values=0,found_group=0; diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index d63ddbf3702..5b8ec96b4d1 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -381,7 +381,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) reg1 SEC_LINK *next,**start; #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("check_keycache",test_key_cache("start of find_key_block",0);); + DBUG_EXECUTE("check_keycache2",test_key_cache("start of find_key_block",0);); #endif *error=0; @@ -459,7 +459,7 @@ static SEC_LINK *find_key_block(int file, my_off_t filepos, int *error) } _my_used_last=next; #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) - DBUG_EXECUTE("check_keycache",test_key_cache("end of find_key_block",0);); + DBUG_EXECUTE("check_keycache2",test_key_cache("end of find_key_block",0);); #endif return next; } /* find_key_block */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 7a0fb4ccddc..982e32a9fd7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -429,7 +429,7 @@ static void close_connections(void) if (error != 0 && !count++) sql_print_error("Got error %d from pthread_cond_timedwait",error); #endif -#if defined(AIX_3_2) || defined(HAVE_DEC_3_2_THREADS) +#if defined(HAVE_DEC_3_2_THREADS) || defined(SIGNALS_DONT_BREAK_READ) if (ip_sock != INVALID_SOCKET) { DBUG_PRINT("error",("closing TCP/IP and socket files")); @@ -544,9 +544,9 @@ static void close_connections(void) (void) pthread_mutex_unlock(&LOCK_thread_count); mysql_log.close(1); + mysql_slow_log.close(1); mysql_update_log.close(1); mysql_bin_log.close(1); - my_free(charsets_list, MYF(0)); DBUG_PRINT("quit",("close_connections thread")); DBUG_VOID_RETURN; } @@ -680,6 +680,7 @@ void clean_up(bool print_message) end_raid(); #endif free_defaults(defaults_argv); + my_free(charsets_list, MYF(MY_ALLOW_ZERO_PTR)); my_free(mysql_tmpdir,MYF(0)); x_free(opt_bin_logname); bitmap_free(&temp_pool); @@ -2487,9 +2488,7 @@ static struct option long_options[] = { {"chroot", required_argument, 0, 'r'}, {"character-sets-dir", required_argument, 0, (int) OPT_CHARSETS_DIR}, {"datadir", required_argument, 0, 'h'}, -#ifndef DBUG_OFF {"debug", optional_argument, 0, '#'}, -#endif {"default-character-set", required_argument, 0, 'C'}, {"default-table-type", required_argument, 0, (int) OPT_TABLE_TYPE}, {"delay-key-write-for-all-tables", @@ -2544,10 +2543,8 @@ static struct option long_options[] = { (int) OPT_DISCONNECT_SLAVE_EVENT_COUNT}, {"abort-slave-event-count", required_argument, 0, (int) OPT_ABORT_SLAVE_EVENT_COUNT}, -#if !defined(DBUG_OFF) && defined(SAFEMALLOC) {"safemalloc-mem-limit", required_argument, 0, (int) OPT_SAFEMALLOC_MEM_LIMIT}, -#endif {"new", no_argument, 0, 'n'}, {"old-protocol", no_argument, 0, 'o'}, #ifdef ONE_THREAD @@ -3165,12 +3162,12 @@ static void get_options(int argc,char **argv) long_options, &option_index)) != EOF) { switch(c) { -#ifndef DBUG_OFF case '#': +#ifndef DBUG_OFF DBUG_PUSH(optarg ? optarg : default_dbug_option); +#endif opt_endinfo=1; /* unireg: memory allocation */ break; -#endif case 'a': opt_ansi_mode=1; thd_startup_options|=OPTION_ANSI_MODE; @@ -3205,11 +3202,11 @@ static void get_options(int argc,char **argv) case 'P': mysql_port= (unsigned int) atoi(optarg); break; -#if !defined(DBUG_OFF) && defined(SAFEMALLOC) case OPT_SAFEMALLOC_MEM_LIMIT: +#if !defined(DBUG_OFF) && defined(SAFEMALLOC) safemalloc_mem_limit = atoi(optarg); - break; #endif + break; case OPT_SOCKET: mysql_unix_port= optarg; break; diff --git a/sql/violite.c b/sql/violite.c index ec08e0a103f..902110ff072 100644 --- a/sql/violite.c +++ b/sql/violite.c @@ -179,7 +179,7 @@ int vio_read(Vio * vio, gptr buf, int size) #ifndef DBUG_OFF if (r < 0) { - DBUG_PRINT("error", ("Got error %d during read",errno)); + DBUG_PRINT("vio_error", ("Got error %d during read",errno)); } #endif /* DBUG_OFF */ DBUG_PRINT("exit", ("%d", r)); @@ -207,7 +207,7 @@ int vio_write(Vio * vio, const gptr buf, int size) #ifndef DBUG_OFF if (r < 0) { - DBUG_PRINT("error", ("Got error on write: %d",errno)); + DBUG_PRINT("vio_error", ("Got error on write: %d",errno)); } #endif /* DBUG_OFF */ DBUG_PRINT("exit", ("%d", r)); @@ -346,7 +346,7 @@ int vio_close(Vio * vio) } if (r) { - DBUG_PRINT("error", ("close() failed, error: %d",errno)); + DBUG_PRINT("vio_error", ("close() failed, error: %d",errno)); /* FIXME: error handling (not critical for MySQL) */ } vio->type= VIO_CLOSED;