From 019b5ab7b4bf0f0407681cbe33ff561b362695bc Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Tue, 24 Sep 2002 22:24:30 +0200 Subject: [PATCH 1/7] - backported gcc 3.0 linking fix from 4.0 - some cosmetical fixups (typos, comments) --- client/mysqlbinlog.cc | 2 ++ configure.in | 19 +++++++------- include/global.h | 59 +++++++++++++++++++++++++++++-------------- sql/mysqld.cc | 2 ++ 4 files changed, 54 insertions(+), 28 deletions(-) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index ac2f3e4efda..e05fd63e344 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -470,3 +470,5 @@ int main(int argc, char** argv) #else #include "log_event.cc" #endif + +FIX_GCC_LINKING_PROBLEM diff --git a/configure.in b/configure.in index 1feca507489..7051db63e5c 100644 --- a/configure.in +++ b/configure.in @@ -319,7 +319,7 @@ then # mysqld doesn't use run-time-type-checking, so we disable it. CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti" - # If you are using 'gcc' 3.0 (not g++) to compile C++ programs, + # If you are using 'gcc' 3.0 (not g++) to compile C++ programs on Linux, # we will gets some problems when linking static programs. # The following code is used to fix this problem. @@ -327,8 +327,7 @@ then then if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1 then - CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW" - CXXLDFLAGS="$CXXLDFLAGS -Wl,--defsym -Wl,__cxa_pure_virtual=0" + CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL" fi fi fi @@ -368,6 +367,7 @@ AC_PATH_PROG(HOSTNAME, hostname, hostname) # Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and # fall back to 'tar' otherwise and hope that it's a GNU tar as well AC_CHECK_PROGS(TAR, gnutar gtar tar) + dnl We use a path for perl so the script startup works dnl We make sure to use perl, not perl5, in hopes that the RPMs will dnl not depend on the perl5 binary being installed (probably a bug in RPM) @@ -654,15 +654,13 @@ AC_ARG_WITH(mysqld-user, ) AC_SUBST(MYSQLD_USER) -# If we should allove LOAD DATA LOCAL +# If we should allow LOAD DATA LOCAL AC_MSG_CHECKING(if we should should enable LOAD DATA LOCAL by default) AC_ARG_ENABLE(local-infile, - [ --enable-local-infile - Enable LOAD DATA LOCAL INFILE (default: disabled)], + [ --enable-local-infile Enable LOAD DATA LOCAL INFILE (default: disabled)], [ ENABLED_LOCAL_INFILE=$enableval ], [ ENABLED_LOCAL_INFILE=no ] ) - if test "$ENABLED_LOCAL_INFILE" = "yes" then AC_MSG_RESULT([yes]) @@ -724,7 +722,7 @@ MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib) #-------------------------------------------------------------------- AC_ARG_WITH(libwrap, -[ --with-libwrap[=DIR] Compile in libwrap (tcp_wrappers) support],[ +[ --with-libwrap[=DIR] Compile in libwrap (tcp_wrappers) support],[ case "$with_libwrap" in no) : ;; yes|*) @@ -1346,6 +1344,7 @@ else DEBUG_OPTIMIZE_CXX="" OPTIMIZE_CXXFLAGS="-O" fi + AC_ARG_WITH(debug, [ --without-debug Build a production version without debugging code], [with_debug=$withval], @@ -1578,13 +1577,15 @@ ac_save_CXXFLAGS="$CXXFLAGS" AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style, AC_LANG_SAVE AC_LANG_CPLUSPLUS -# Do not treat warnings as errors if we are linking agaist other libc + +# Do not treat warnings as errors if we are linking against other libc # this is to work around gcc not being permissive on non-system includes # with respect to ANSI C++ if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no" then CXXFLAGS="$CXXFLAGS -Werror" fi + AC_TRY_COMPILE( [#undef inline #if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT) diff --git a/include/global.h b/include/global.h index 8067fe5f38b..1525a7c6e06 100644 --- a/include/global.h +++ b/include/global.h @@ -135,6 +135,13 @@ double my_ulonglong2double(unsigned long long A); #define __LONG_MAX__ 2147483647 #endif +/* Fix problem when linking c++ programs with gcc 3.x */ +#ifdef DEFINE_CXA_PURE_VIRTUAL +#define FIX_GCC_LINKING_PROBLEM extern "C" { int __cxa_pure_virtual() {return 0;} } +#else +#define FIX_GCC_LINKING_PROBLEM +#endif + /* egcs 1.1.2 has a problem with memcpy on Alpha */ #if defined(__GNUC__) && defined(__alpha__) && ! (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) #define BAD_MEMCPY @@ -270,7 +277,7 @@ int __void__; #define LINT_INIT(var) #endif -/* Define som useful general macros */ +/* Define some useful general macros */ #if defined(__cplusplus) && defined(__GNUC__) #define max(a, b) ((a) >? (b)) #define min(a, b) ((a) ; template class I_List_iterator; template class I_List; template class I_List; + +FIX_GCC_LINKING_PROBLEM #endif From 9d8ec46b6cca83b506c7550e22612dcf00dd8810 Mon Sep 17 00:00:00 2001 From: "tfr@beta.frontier86.ee" <> Date: Fri, 27 Sep 2002 00:33:48 +0300 Subject: [PATCH 2/7] manual.texi: Clean out 'Graphical clients' section of the contributed software section --- BitKeeper/etc/logging_ok | 1 + Docs/manual.texi | 161 --------------------------------------- 2 files changed, 1 insertion(+), 161 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 942ea88713a..63acc19a75c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -82,3 +82,4 @@ worm@altair.is.lan zak@balfor.local zak@linux.local zgreant@mysql.com +tfr@beta.frontier86.ee diff --git a/Docs/manual.texi b/Docs/manual.texi index 9db4fc96cbe..99c94c694be 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -49170,167 +49170,6 @@ By Thomas Thaele @email{tthaele@@papenmeier.de} @appendixsec Clients -@itemize @bullet -@item Graphical clients -@itemize @minus -@item @uref{http://www.ideit.com/products/dbvis/} -DbVisualizer, a freeware JDBC client to graphically visualise -the data and structure of several databases simultaneously. -By Innovative-IT Development AB. - -@item @uref{http://www.mysql.com/downloads/gui-clients.html} -MySQLGUI, the MySQL GUI client homepage. By Sinisa at MySQL AB. - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysql_navigator_0.9.0.tar.gz} -MySQL Navigator is a MySQL database server GUI client program, distributed -under GPL license. The purpose of MySQL Navigator is to provide a useful -client interface to MySQL database servers, whilst supporting multiple -operating systems and languages. You can currently import/export database, -enter queries, get result sets, edit scripts, run scripts, add, alter, and -delete users, and retrieve client and server information. Uses QT 2.2. -The homepage for MySQL Navigator is at @uref{http://sql.kldp.org/mysql/}. - -@item @uref{http://www.mysql.com/Downloads/Win32/secman.zip} -A user and security management GUI for MySQL on Windows. -By Martin Jeremic. -The homepage for MySQL Security GUI is at @uref{http://jsoft.webjump.com/}. - -@item @uref{http://www.mysql.com/Downloads/Contrib/kmysqladmin-0.4.1.tar.gz}. -@item @uref{http://www.mysql.com/Downloads/Contrib/kmysqladmin-0.4.1-1.src.rpm}. -@item @uref{http://www.mysql.com/Downloads/Contrib/kmysqladmin-0.4.1-1.i386.rpm} -An administration tool for the MySQL server using QT / KDE. Tested -only on Linux. - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysql-admin-using-java+swing.tar.gz} -Java client using Swing, by Fredy Fischer (@email{se-afs@@dial.eunet.ch}). -You can always find the latest version at -@uref{http://www.trash.net/~ffischer/admin/}. - -@item @uref{http://www.mysql.com/Downloads/Win32/MySQL-Maker-1.0.zip}. -Shareware MySQL client for Windows. It's a WYSIWYG tool which allows -you to create, change and delete databases and tables. -You can change field - structure and add, change and delete data in -these tables directly without ODBC-driver. -The MySQL Maker homepage is at @uref{http://www.presult.de/presult/frames/fs_mysqlmaker.html}. - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysqlwinadmn.zip} -Windows GUI (binary only) to administrate a database, by David B. Mansel, -@email{david@@zhadum.org}. - -@item @uref{http://home.online.no/~runeberg/myqa/} -MyQA is a Linux-based query client for the MySQL database server. MyQA -lets you enter SQL queries, execute them, and view the results, all in a -graphical user interface. The GUI is roughly similar to that of the -'Query Analyzer' client that comes with MS SQL Server. - -@item @uref{http://www.opex.atnet.ru/mysqlmanager/} -MySQL Manager is a graphical MySQL server manager for MySQL server -written in Java. - -@item @uref{http://www.mysql.com/Downloads/Win32/netadmin.zip} -An administrator tool for MySQL on Windows 95/98 and Windows NT -4.0. Only tested with MySQL Versions 3.23.5 - 3.23.7. Written -using the Tmysql components. - -You can write queries and show tables, indexes, table syntax, and -administrate user, host, and database and so on. This is beta and -still has some bugs. You can test the program with all features. Please -send bugs and hints to Marco Suess @email{ms@@it-netservice.de}. Original -URL @uref{http://www.it-netservice.de/pages/software/}. - -@item @uref{http://www.mysql.com/Downloads/Win32/netadmin2.zip} -New version of netadmin. See above for details. - -@item @uref{http://www.mysql.com/Downloads/Win32/ARTADMIN203.EXE} -Atronic's MySQL client for Windows 2.0.3.0. -The home page for this can be found at @uref{http://www.artronic.hr/}. - -@item @uref{http://www.mysql.com/Downloads/Win32/W9xstop.zip} -Utility from Artronic to stop MySQL on win9x. - -@item @uref{http://bardo.hyperlink.cz/mysqlmon/} -A light weight GUI client for Windows. - -@item @uref{http://www.mysqlfront.de/} -MySQLfront is a very nice Windows client with lots of useful features. -By Angsar Becker. - -@item @uref{http://www.dbtools.com.br/} -Dbtools, a tool to manage MySQL databases. Currently only for Windows. -Some features: -@itemize @bullet -@item Manage servers, databases, tables, columns, indexes, and users -@item Import wizard to import structure and data from MS Access, MS Excel, Dbase, FoxPro, Paradox, and ODBC Databases. - -@item @uref{http://www.mysql.com/Downloads/Contrib/KMYENG113.zip} -An administrator GUI for MySQL. Works only on Windows, no source. -Available in English and Japanese. By Mitunobu Kaneko. -Home page: @uref{http://sql.jnts.ne.jp/} -@end itemize - -@item @uref{http://www.mysql.com/Downloads/Contrib/xmysqladmin-1.0.tar.gz} -An X-based front end to the MySQL database engine. It allows reloads, -status check, process control, myisamchk, grant/revoke privileges, -creating databases, dropping databases, create, alter, browse, and drop -tables. Originally by Gilbert Therrien, @email{gilbert@@ican.net} but -now in public domain and supported by MySQL AB. - -@item @uref{http://www.mysql.com/Downloads/Contrib/xmysql-1.9.tar.gz}. -xmysqlA front end to the MySQL database engine. It allows for simple -queries and table maintenance, as well as batch queries. By Rick -Mehalick, @email{dblhack@@wt.net}. -The xmysql homepage is at @uref{http://web.wt.net/~dblhack/} -Requires @uref{http://bragg.phys.uwm.edu/xforms/} (xforms 0.88) to work. - -@item @uref{http://www.tamos.net/sw/dbMetrix/} -dbMatrix is an @code{Open Source} client for exploring databases and executing -SQL. Supports MySQL, Oracle, PostgreSQL, and mSQL. - -@item @uref{http://www.multimania.com/bbrox/GtkSQL/} -GtkSQL is a query tool for MySQL and PostgreSQL. - -@item @uref{http://dbman.linux.cz/} -dbMan is a query tool written in Perl. Uses DBI and Tk. - -@item @uref{http://www.mysql.com/Downloads/Win32/Msc201.EXE} (Mascon 202) -@item @uref{http://www.mysql.com/Downloads/Win32/FrMsc202.EXE} (Free Mascon 202) -Mascon is a powerful Win32 GUI for the administering MySQL server -databases. Mascon's features include visual table design, connections to -multiple servers, data and blob editing of tables, security setting, SQL -color coding, dump functionality and much more. -The Mascon homepage is at @uref{http://www.scibit.com/Products/Software/Utils/Mascon.asp}. -@item @uref{http://www.virtualbeer.net/dbui/} -DBUI is a Gtk graphical database editor. -@item @uref{http://www.rtlabs.com/} -MacSQL is a GUI for MySQL, ODBC, and JDBC databases for the Mac OS. -@item @uref{http://www.caleb.com.au/} -JRetriever is a generic database front-end tool for JDBC compliant -databases written with Java 2. JRetriever displays database -tables/views in a Windows explorer-like front end. Users can retrieve -data either by clicking on the table folder or by composing their own SQL -statements with our built-in SQL editor. The tool has been tested with -Oracle 8 and MySQL as the back-end databases. It requires JDK 1.3 from -JavaSoft. -@item @uref{http://www.jetools.com/products/databrowser/} -The DataBrowser is a cross-database, cross-platform data access tool. It is more -user friendly than tools like SQL Plus, psql (command-line based tools). It is more -flexible than TOAD, ISQL, PGAccess which are GUI's that are limitied to a single -platform or database. -@item @uref{http://www.intrex.net/amit/software/} -The SQL Console is a standalone java application that allows you to connect to a - SQL database system and issue SQL queries and updates. It has an easy-to use -graphical user interface. The SQL Console uses JDBC to connect to the database -systems and, therefore, with proper JDBC drivers, you can use this utility to -connect to some of the most popular database systems. -@item @uref{http://www.mysql.com/Downloads/Contrib/mysql_mmc.zip} -MySQL MMC is a GUI Management Tool developed using kdevelop -with a very good interface completely like Microsoft -Enterprise Tool (for SQL Server) or Sybase Central. We -can use it to manage server, database, table, index, -users and to edit table data in grid or execute Sql -by Query Analysis. -@end itemize - @cindex Web clients @item Web Clients @itemize @minus From 144d7cc79b4dcf077869096578db47c2764b4d6b Mon Sep 17 00:00:00 2001 From: "tfr@beta.frontier86.ee" <> Date: Fri, 27 Sep 2002 01:42:08 +0300 Subject: [PATCH 3/7] manual.texi: Remove 'web clients' contrib section --- Docs/manual.texi | 58 ------------------------------------------------ 1 file changed, 58 deletions(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index cbe54885588..06c0089f2fe 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -49170,64 +49170,6 @@ By Thomas Thaele @email{tthaele@@papenmeier.de} @appendixsec Clients -@cindex Web clients -@item Web Clients -@itemize @minus -@item @uref{http://www.mysql.com/Downloads/Contrib/mysqladmin-atif-1.0.tar.gz} -WWW MySQL administrator for the @code{user,} @code{db} and -@code{host} tables. By Tim Sailer, modified by Atif Ghaffar -@email{aghaffar@@artemedia.ch}. - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysql-webadmin-1.0a8-rz.tar.gz} -A tool written in PHP-FI to administrate MySQL databases -remotely over the web within a web-browser. By Peter Kuppelwieser, -@email{peter.kuppelwieser@@kantea.it}. Updated by Wim Bonis, -@email{bonis@@kiss.de}. Not maintained anymore! - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysqladm.tar.gz} -MySQL Web Database Administration written in Perl. By Tim Sailer. - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysqladm-2.tar.gz} -Updated version of @file{mysqladm.tar.gz}, by High Tide. - -@item @uref{http://www.mysql.com/Downloads/Contrib/billowmysql.zip} -Updated version of @file{mysqladm.tar.gz}, by Ying Gao. You can get the -newest version from @uref{http://civeng.com/sqldemo/} (the home site). - -@item @uref{http://www.mysql.com/Downloads/Contrib/myadmin-0.4.tar.gz}. -MyAdmin is a web-based MySQL administrator by Mike Machado. -TheMyAdmin homepage is at @uref{http://myadmin.cheapnet.net/} - -@item @uref{http://www.mysql.com/Downloads/Contrib/phpMyAdmin_2.2.0.tar.gz} -A set of PHP3-scripts to adminstrate MySQL over the WWW. - -@item @uref{http://www.phpwizard.net/projects/phpMyAdmin/} -phpMyAdmin is 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} -MySQL administrator in PHP. By Ofni Thomas -@email{othomas@@vaidsystems.com}. - -@item @uref{http://gossamer-threads.com/perl/mysqlman/mysql.cgi} -MySQLMan has similar functionality to phpmyadmin, but written with -Perl and using html templates. By Alex Krohn. -@end itemize - -@item @uref{http://www.mysql.com/Downloads/Contrib/mysql-editor.tar.gz} -This cgi scripts in Perl enables you to edit content of Mysql -database. By Tomas Zeman. - -@item @uref{http://worldcommunity.com/opensource/futuresql/} -FutureSQL by Peter F. Brown, is a free, @code{Open Source} rapid application -development web database administration tool, written in Perl, -using MySQL. It uses @code{DBI:DBD} and @code{CGI.pm}. - -FutureSQL allows one to easily set up config files to view, edit, delete, -and otherwise process records from a MySQL database. It uses a data -dictionary, configuration files and templates, and allows "pre-processing" -and "post-processing" on both fields, records, and operations. -@end itemize - @cindex web tools @cindex tools,, web @appendixsec Web Tools From 3a9eb4f6210159dd34a4cad0e9c447fcd3704535 Mon Sep 17 00:00:00 2001 From: "monty@hundin.mysql.fi" <> Date: Fri, 27 Sep 2002 08:23:51 +0300 Subject: [PATCH 4/7] Fix some ORDER BY ... DESC problems with InnoDB --- sql/ha_heap.h | 5 +++-- sql/ha_isammrg.h | 4 ++-- sql/handler.h | 2 +- sql/sql_select.cc | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sql/ha_heap.h b/sql/ha_heap.h index aa675cfffea..504f5262bf3 100644 --- a/sql/ha_heap.h +++ b/sql/ha_heap.h @@ -41,13 +41,14 @@ class ha_heap: public handler { return (HA_READ_RND_SAME | HA_NO_INDEX | HA_KEYPOS_TO_RNDPOS | HA_NO_BLOBS | HA_NULL_KEY | HA_REC_NOT_IN_SEQ | - HA_NOT_READ_PREFIX_LAST | HA_NO_AUTO_INCREMENT); + HA_NO_AUTO_INCREMENT); } ulong index_flags(uint inx) const { return ((table->key_info[inx].algorithm == HA_KEY_ALG_BTREE) ? (HA_READ_NEXT | HA_READ_PREV | HA_READ_ORDER) : - (HA_ONLY_WHOLE_INDEX | HA_WRONG_ASCII_ORDER)); + (HA_ONLY_WHOLE_INDEX | HA_WRONG_ASCII_ORDER | + HA_NOT_READ_PREFIX_LAST)); } uint max_record_length() const { return HA_MAX_REC_LENGTH; } uint max_keys() const { return MAX_KEY; } diff --git a/sql/ha_isammrg.h b/sql/ha_isammrg.h index bbe75a74db8..c936a15164a 100644 --- a/sql/ha_isammrg.h +++ b/sql/ha_isammrg.h @@ -33,9 +33,9 @@ class ha_isammrg: public handler const char *table_type() const { return "MRG_ISAM"; } const char **bas_ext() const; ulong table_flags() const { return (HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS | - HA_NOT_READ_PREFIX_LAST | HA_REC_NOT_IN_SEQ); } - ulong index_flags(uint idx) const { return 0; } + ulong index_flags(uint idx) const { return HA_NOT_READ_PREFIX_LAST; } + uint max_record_length() const { return HA_MAX_REC_LENGTH; } uint max_keys() const { return 0; } uint max_key_parts() const { return 0; } diff --git a/sql/handler.h b/sql/handler.h index c1f62dd26ef..c580a3a158a 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -81,7 +81,7 @@ #define HA_READ_PREV 4 /* Read prev. record with same key */ #define HA_READ_ORDER 8 /* Read through record-keys in order */ #define HA_ONLY_WHOLE_INDEX 16 /* Can't use part key searches */ -#define HA_NOT_READ_PREFIX_LAST 32 +#define HA_NOT_READ_PREFIX_LAST 32 /* No support for index_read_last() */ #define HA_KEY_READ_ONLY 64 /* Support HA_EXTRA_KEYREAD */ /* diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3e2ed88a127..c2592f4aa65 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5576,7 +5576,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, Use a traversal function that starts by reading the last row with key part (A) and then traverse the index backwards. */ - if (table->file->table_flags() & HA_NOT_READ_PREFIX_LAST) + if (table->file->index_flags(ref_key) & HA_NOT_READ_PREFIX_LAST) DBUG_RETURN(0); // Use filesort tab->read_first_record= join_read_last_key; tab->read_record.read_record= join_read_prev_same; From 649413f773955b982b8eb963422702a0a8e481db Mon Sep 17 00:00:00 2001 From: "monty@hundin.mysql.fi" <> Date: Fri, 27 Sep 2002 12:01:26 +0300 Subject: [PATCH 5/7] Don't reset Delayed_insert_threads on FLUSH STATUS --- Docs/manual.texi | 2 ++ sql/mysqld.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Docs/manual.texi b/Docs/manual.texi index ac2d569ffc6..24b6ad6d4a8 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46929,6 +46929,8 @@ not yet 100% confident in this code. @appendixsubsec Changes in release 3.23.53 @itemize @bullet @item +Fixed that @code{SHOW STATUS} doesn't reset @code{Delayed_insert_threads}. +@item Fixed core dump bug when using the @code{BINARY} cast on a @code{NULL} value. @item Fixed race condition when someone did a @code{GRANT} at the same time a new diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8098d324af5..b5c789548e7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3182,7 +3182,7 @@ struct show_var_st status_vars[]= { {"Created_tmp_disk_tables", (char*) &created_tmp_disk_tables,SHOW_LONG}, {"Created_tmp_tables", (char*) &created_tmp_tables, SHOW_LONG}, {"Created_tmp_files", (char*) &my_tmp_file_created, SHOW_LONG}, - {"Delayed_insert_threads", (char*) &delayed_insert_threads, SHOW_LONG}, + {"Delayed_insert_threads", (char*) &delayed_insert_threads, SHOW_LONG_CONST}, {"Delayed_writes", (char*) &delayed_insert_writes, SHOW_LONG}, {"Delayed_errors", (char*) &delayed_insert_errors, SHOW_LONG}, {"Flush_commands", (char*) &refresh_version, SHOW_LONG_CONST}, From 3b6f843bb5c09bba6f18f320de01ca4a26c7f8ad Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Fri, 27 Sep 2002 11:24:11 +0200 Subject: [PATCH 6/7] - Fix checking for $orbit_config_path in acinclude.m4 (gave an error message on STDOUT on AIX and assigned the wrong value) --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 488d35c1268..72b50bcc18f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -800,7 +800,7 @@ dnl get substituted. AC_DEFUN(MYSQL_CHECK_ORBIT, [ AC_MSG_CHECKING(for ORBit) orbit_config_path=`which orbit-config` -if test -n "$orbit_config_path" +if test -n "$orbit_config_path" -a $? = 0 then orbit_exec_prefix=`orbit-config --exec-prefix` orbit_includes=`orbit-config --cflags server` From 9a2c402cc86b8b3a87d15f606318ed3b42e5ead5 Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Fri, 27 Sep 2002 15:27:14 +0200 Subject: [PATCH 7/7] - renamed gtar->tar in Build-tools/mysql-copyright, since it is more common, especially on our main build systems - cosmetical fix in mysql.spec --- Build-tools/mysql-copyright | 4 ++-- support-files/mysql.spec.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright index 0d49acac400..68673f3f53f 100755 --- a/Build-tools/mysql-copyright +++ b/Build-tools/mysql-copyright @@ -89,7 +89,7 @@ sub main } # everything should be ok, continue with extracting.. - `gtar xfz ../$distfile`; + `tar xfz ../$distfile`; $pec= $? >> 8; abort($dir, "Extracting from tar failed!\n") if ($pec); @@ -107,7 +107,7 @@ sub main `mv -f $destdir $newdistname`; # tar the new distribution - `gtar cz -f $opt_target/$newdistname.tar.gz *`; + `tar cz -f $opt_target/$newdistname.tar.gz *`; $pec= $? >> 8; abort($dir, "Making new tar archive failed!\n") if ($pec); diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 69571b65092..dcff17dee03 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -519,7 +519,7 @@ fi take care of this - reorganized the file list: actually install man pages along with the binaries of the respective subpackage -- donīt include libmysqld.a in the devel subpackage as well, if we +- do not include libmysqld.a in the devel subpackage as well, if we have a special "embedded" subpackage - reworked the package descriptions