summaryrefslogtreecommitdiff
path: root/acinclude.m4
Commit message (Collapse)AuthorAgeFilesLines
* Post-review fix: Drop the duplicate assignment.unknown2005-03-291-2/+0
|
* Introduce "configure" support for a new '-with-big-tables' option that can ↵unknown2005-03-291-0/+30
| | | | | | | | | | | | | | | | replace the current way of passing '-DBIG_TABLES' to the compilers. This is needed even in 4.0, as 'Do-compile-all' must use this new approach for all "max" builds in 4.0, 4.1, and up. acinclude.m4: Provide a new macro 'MYSQL_CHECK_BIG_TABLES' to check a '-with-big-tables' option and set the CPP symbol 'BIG_TABLES' accordingly. configure.in: Call the new 'MYSQL_CHECK_BIG_TABLES' macro.
* make --with-openssl work with parameters as expected,unknown2004-09-261-2/+21
| | | | | | | | | | old options for include path and library settings still work for backwards compatibility (fix for BUG #5494) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* - Applied some portability fixes for SGI IRIX/MipsPro compilerunknown2004-06-221-2/+3
| | | | | | | | | | | | | | | | | | | | (e.g. a fix for BUG#3507 and some modifications recommended by Andrea Suatoni and Joerg Behrens - thank you!) acinclude.m4: - OpenSSL libs are installed in /usr/freeware/include and /usr/freeware/lib32 on SGI IRIX - expanded search list man/mysqlaccess.1.in: - cosmetical fix man/mysqldump.1.in: - cosmetical fix mysys/hash.c: - portability fix: some compilers can't handle inlining of rec_hashnr (BUG#3507) vio/test-sslserver.c: - portability fix for SGI MipsPro compiler: define client_len as "socklen_t" instead of "size_t"
* Remove libcom.a from acinclude.m4 (should have been done in ChangeSet 1.1741)unknown2004-03-111-1/+0
| | | | | acinclude.m4: innodb_libs: Remove libcom.a
* Cleanupsunknown2004-02-221-1/+0
| | | | | | | | | | | acinclude.m4: Remove innobase/libodbc innobase/Makefile.am: Remove innobase/libodbc sql/sql_delete.cc: Indentation cleanup sql/sql_yacc.yy: Fixed wrong merge
* Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-12-101-2/+2
|\ | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.ssl acinclude.m4: Auto merged
| * Fix for bug# 1142 ./configure - error in file causes failure of compile (SSL ↵unknown2003-12-101-2/+2
| | | | | | | | option needed)
| * Fix for Bug #1142 unknown2003-09-011-2/+2
| | | | | | | | | | | | | | './configure - error in file causes failure of compile (SSL option needed)'
* | Block SIGPIPE also for not threaded client programs.unknown2003-09-231-1/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --include and --libs_r options to mysql_config. Added mysql_get_client_version() to client library Fixed some minor benchmark issues acinclude.m4: Fixed that 'no' is printed if openssl not used configure.in: Fixed error message extra/comp_err.c: Skip lines before first { include/mysql.h: Indentation cleanup libmysql/libmysql.c: Block SIGPIPE also for not threaded programs. This is now done once in mysql_server_init() and not for every call to mysql_init(). Added mysql_get_client_version() libmysql/libmysql.def: added mysql_get_client_version scripts/Makefile.am: Add openssl libraries to mysql_config scripts/mysql_config.sh: Added options --include and --libs_r Added C compiler options to 'cflags' scripts/mysql_install_db.sh: Fixed tests with IN_RPM to not give warnings sql-bench/bench-init.pl.sh: Updated version number sql-bench/server-cfg.sh: Remove duplicate line sql-bench/test-alter-table.sh: Increase loops for more relevant test sql-bench/test-select.sh: Fix wrong test for count_distinct_2 tests/mail_to_db.pl: Default db and table for easier usage
* Add detection of in_addr_tunknown2003-08-281-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. (This will probably solve bug #563) Fix test for available file descriptors in mysqltest Fixed core dump bug in replication tests when running without transactional table support acconfig.h: Add detection of in_addr_t acinclude.m4: Add detection of in_addr_t configure.in: Add detection of in_addr_t extra/my_print_defaults.c: Cleanup extra/resolveip.c: Add detection of in_addr_t libmysql/dll.c: Fixed C++ commments myisam/mi_dynrec.c: Add ASSERT if allocated record length is to small myisam/mi_open.c: Add pack_bits to pack_reclength for dynamic rows. This solves buffer a possible buffer overflow on update. myisam/mi_test_all.sh: Added valgrind option to make it easier to verify tests mysql-test/include/check_var_limit.inc: Fix test for available file descriptors mysql-test/r/myisam.result: More tests mysql-test/t/myisam.test: More tests mysql-test/t/query_cache_merge.test: Fix test for available file descriptors mysys/default.c: Cleanup mysys/my_pthread.c: Remove C++ comments sql/log.cc: Code cleanup Fixed core dump bug in replication tests when running without transactional table support.
* - portability fixes: put string tests in double quotes (BUG#974). unknown2003-08-011-16/+16
| | | | | | | Thanks to Alex Kiernan for the hint.
* Fix: remove compile warnings on RH(with openssl)unknown2003-07-251-1/+6
|
* --with-openssl-includes/librariesunknown2003-07-231-4/+4
|
* Bug #554: Support for --with-openssl[=DIR]unknown2003-07-221-1/+1
|
* Bug #554: Support for --with-openssl[=DIR]unknown2003-07-221-13/+42
| | | | | | | | | | Here is fix for bug 554. Added configure options --with-openssl-includes[=DIR] and --with-openssl-libs[=DIR] acinclude.m4: Bug #554: Support for --with-openssl[=DIR]
* Portability fixes for Redhat 9unknown2003-07-181-3/+12
| | | | | | | | | acinclude.m4: Fixed problem with openssl on RedHat 9 vio/viosocket.c: Removed compiler warning BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Portability fixesunknown2003-07-151-3/+10
| | | | | | | acinclude.m4: Made test for compress more reliable (for Solaris) sql/item_strfunc.cc: Portability fix (for Linux Alpha)
* - Added /usr/lib64 to the path to search for libssl.a (required on AMD64)unknown2003-06-181-2/+2
| | | | | | | - fixed a typo
* Fix for -fbranch-probabilites (bug 268)unknown2003-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for LEFT/RIGHT/MID with multi-byte-character sets (bug 314) Fix for new bison 1.875 max_insert_delayed_threads and delayed_insert_timeout now works as documented (bug 211) Don't show port in SHOW PROCESSLIST for system threads Fix problem with ORDER BY being discarded for some DISTINCT queries (bug 275) Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when using many joined tables (Bug 212) acinclude.m4: Fix for -fbranch-probabilites configure.in: Fix for -fbranch-probabilites myisam/mi_open.c: Give error instead of writing to stderr (Which user can't see) mysql-test/r/join.result: Update results after change to NATURAL/LEFT/RIGHT JOIN mysql-test/r/join_outer.result: Update results after change to NATURAL/LEFT/RIGHT JOIN mysql-test/r/select.result: Update results after change to NATURAL/LEFT/RIGHT JOIN mysql-test/t/join.test: Update results after change to NATURAL/LEFT/RIGHT JOIN sql/item_strfunc.cc: Fix for LEFT/RIGHT/MID with multi-byte-character sets sql/mysqld.cc: Fix for new bison 1.875 (Wrong error text message when one got syntax error) sql/sql_class.cc: Don't show port in SHOW PROCESSLIST for system threads sql/sql_insert.cc: max_insert_delayed_threads now works as documented. delayed_insert_timeout now works on Linux sql/sql_parse.cc: Added comment sql/sql_select.cc: Fix problem with ORDER BY being discarded and results returned un-sorted sql/sql_yacc.yy: Fixed bug with NATURAL LEFT JOIN, NATURAL RIGHT JOIN and RIGHT JOIN when using many joined tables.
* A lot of portability fixes.unknown2003-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables. BUILD/SETUP.sh: Enabled uninitalized warnings for debug builds. Build-tools/Do-compile: Added options --no-mysqltest and --no-benchmarks Log time before each stage Removed warnings on some OS (at least hpux11) acinclude.m4: Fixed call to wrong function configure.in: Don't use -O3 as compiler option with aCC innobase/include/univ.i: Removed compiler warning (on Hpux11) innobase/os/os0file.c: Removed compiler warning (on Hpux11) innobase/trx/trx0sys.c: Removed compiler warning (on Hpux11) innobase/trx/trx0trx.c: Removed compiler warning (on Hpux11) innobase/ut/ut0ut.c: Removed compiler warning (with gcc) myisam/mi_check.c: Added missing 'static' myisam/mi_test1.c: Added missing 'static' mysys/my_getopt.c: Added missing 'static' sql/ha_berkeley.cc: Added rename table. This fixes a bug in ALTER TABLE with BDB tables. Fixed compilation problem on OSF1 sql/ha_berkeley.h: Added rename table. This fixes a bug in ALTER TABLE with BDB tables. sql/mini_client.cc: Added reinterpret cast to avoid some warnings. sql/sql_parse.cc: Added reinterpret cast to avoid some warnings. Removed usage of strnlen() as this gave portability problems. sql/sql_union.cc: Added reinterpret cast to avoid some warnings. sql/table.cc: Added reinterpret cast to avoid some warnings. tools/mysqlmanager.c: Added missing 'static'
* Changed thd variables max_join_size and select_limit to type ha_rows.unknown2002-12-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixed some optimization problems when using -DBIG_TABLES Portabilty fixes for OpenUnix and HPUX Added C and C++ version numbers to mysqlbug Docs/mysqld_error.txt: Added new error message acinclude.m4: Fix for configure problem on OpenUnix configure.in: Fix for OpenUnix Added C and C++ versions to mysqlbug mysql-test/r/variables.result: Update of max_join_size handling mysql-test/t/variables.test: Update of max_join_size handling mysys/Makefile.am: Removed duplicate row mysys/my_alloc.c: Safety fixes (not fatal) scripts/Makefile.am: Added C and C++ compiler versions to mysqlbug scripts/mysqlbug.sh: Added C and C++ compiler versions to mysqlbug sql/item_func.cc: Fixed that user variables that changes are not threated as constants. sql/item_func.h: Fixed that user variables that changes are not threated as constants. sql/mysqld.cc: Changed thd variables max_join_size and select_limit to type ha_rows sql/repl_failsafe.cc: Removed not needed cast sql/set_var.cc: Changed thd variables max_join_size and select_limit to type ha_rows sql/set_var.h: Changed thd variables max_join_size and select_limit to type ha_rows sql/slave.cc: Removed not needed cast sql/sql_class.h: Changed thd variables max_join_size and select_limit to type ha_rows sql/sql_parse.cc: Removed not needed cast Fixed security problem with mysql_drop_db() sql/sql_show.cc: Changed thd variables max_join_size and select_limit to type ha_rows sql/structs.h: Changed thd variables max_join_size and select_limit to type ha_rows
* Merge with 3.23unknown2002-12-041-2/+34
|\ | | | | | | | | | | | | | | | | | | | | | | (Fixed problem with autoconf 2.53 on Solaris) BUILD/compile-solaris-sparc-purify: Merge with 3.23 BUILD/compile-solaris-sparc: Merge with 3.23 acinclude.m4: Merge with 3.23
| * Fixed 'stack direction' check in autoconfunknown2002-12-041-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround for problem with autconf 2.53 on Solaris (Fixes problem with SOCKET_SIZE_TYPE) BUILD/compile-solaris-sparc: Removed non standard compiler options BUILD/compile-solaris-sparc-purify: Removed non standard compiler options acinclude.m4: Fixed 'stack direction' check. Workaround for problem with autconf 2.53 on Solaris (Fixes problem with SOCKET_SIZE_TYPE)
| * - Applied required modifications for automake 1.5unknown2002-11-171-432/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - "make distcheck" needs to be fixed BitKeeper/etc/ignore: Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list acinclude.m4: - removed libtool.m4 (is part of libtool 1.4) config.guess: - applied diffs from config.guess of automake 1.5 config.sub: - applied diffs from config.sub of automake 1.5 configure.in: - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL" - added "AM_PROG_AS" for automake 1.5 dbug/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy extra/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy heap/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy install-sh: - applied diffs from install.sh of automake 1.5 isam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysql_r/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy ltconfig: - small correction for new libtool ltmain.sh: - applied diffs from ltmain.sh of libtool 1.4.2 merge/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy missing: - applied diffs from missing of automake 1.5 myisam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy myisammrg/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy mysys/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy - added $(EXEEXT) to test_charset regex/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy sql/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy strings/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy - removed @CHARSET_SRCS@ vio/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy
* | Added back old LARGEFILE handlingunknown2002-10-291-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed reference to freed memory in acl_init()/grant_init() Fixed possible memory leak. (Could only happen in very strange circumstances) Fixed bug in ALTER TABLE with BDB tables Updated mysql-test for valgrind Docs/manual.texi: ChangeLog acinclude.m4: Added back old LARGEFILE handling. (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x) configure.in: Added back old LARGEFILE handling. (Needed to get MySQL to compile on Solaris 2.9 with gcc 3.x) libmysqld/lib_sql.cc: Fixed reference to freed memory mysql-test/mysql-test-run.sh: Added option --valgrind mysys/Makefile.am: Removed warning when doing make sql/mysqld.cc: Free regexp memory on shutdown. read 'des' key files from data directory Fixed reference to freed memory in grant_init() sql/slave.cc: Fixed wrong printf() argument sql/sql_acl.cc: Fixed reference to freed memory sql/sql_acl.h: Fixed reference to freed memory sql/sql_base.cc: Fixed possible memory leak. (Could only happen in very strange circumstances) sql/sql_parse.cc: Updated arguments to grant_reload() sql/sql_table.cc: Fixed bug in ALTER TABLE with BDB tables sql/sql_yacc.yy: memset -> bzero
* | Fixes after last merge.unknown2002-10-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore changed keyblocks when on does DELETE FROM table_name; acinclude.m4: Don't give warnings when using openssl installed in /usr/include with gcc 3.x myisam/mi_delete_all.c: Ignore changed keyblocks when on does DELETE FROM table_name; mysql-test/r/null_key.result: Fix null test sql/ha_innodb.cc: Fix bug in last merge sql/sql_parse.cc: Fix bug introduced with merge
* | - Applied required modifications for automake 1.5unknown2002-10-011-565/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - some additional small fixes - added "depcomp" for automake 1.5 acinclude.m4: - Removed AC_SYS_LARGEFILE (is in autoconf since v2.50) config.guess: - applied diffs from config.guess of automake 1.5 config.sub: - applied diffs from config.sub of automake 1.5 configure.in: - adapted for automake 1.5 - added AM_PROG_AS - replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in autoconf since v2.50) dbug/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy extra/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy heap/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy include/my_global.h: - fix for PPC64 install-sh: - applied diffs from install-sh of automake 1.5 isam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysql_r/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysqld/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy ltconfig: - small correction for new libtool ltmain.sh: - applied diffs from ltmain.sh of libtool 1.4.2 merge/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy missing: - applied diffs from missing of automake 1.5 myisam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy myisammrg/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy mysys/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy regex/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy sql/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy strings/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy tools/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy vio/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy
* | - Fix checking for $orbit_config_path in acinclude.m4 (gave an errorunknown2002-09-271-1/+1
| | | | | | | | | | | | | | | | | | message on STDOUT on AIX and assigned the wrong value) acinclude.m4: - better checking for $orbit_config_path (thanks to Melvyn Sopacua for the patch)
* | Fixed searching after ssl directories.unknown2002-09-051-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed that GRANT ... REQUIRE options are not forgot when doing new GRANT Changed fn_ext to point at first '.' after directory. FLUSH LOGS removed numerical extension for all future update logs. Fixed the mysqld --help reports right values for --datadir and --bind-address --log-binary=a.b.c now properly strips of .b.c Fix that one can DROP UDF functions that was not loaded at startup Made AND optional in REQUIRE Added REQUIRE NONE BitKeeper/deleted/.del-CodingStyle~1ba7ff62d4cd0ea: Delete: vio/docs/CodingStyle BitKeeper/deleted/.del-COPYING.dbug~ca0c017a4d7e8609: Delete: vio/docs/COPYING.dbug BitKeeper/deleted/.del-COPYING.mysql~471498c82977cd3a: Delete: vio/docs/COPYING.mysql BitKeeper/deleted/.del-README~947354991dc882f8: Delete: vio/docs/README Docs/manual.texi: Changelog acinclude.m4: Fixed searching after ssl directories. client/Makefile.am: Moved openssl include to avoid problem with installed readline include/Makefile.am: Install my_global.h include/violite.h: Fixed that GRANT ... REQUIRE options are not forgot when doing new grant libmysqld/examples/Makefile.am: Moved openssl include to avoid problem with installed readline mysql-test/mysql-test-run.sh: Improved 'which' handling to give error if command is not found mysys/mf_fn_ext.c: Changed fn_ext to point at first '.' after directory. sql/Makefile.am: More comments sql/lex.h: Added NONE as keyword sql/log.cc: FLUSH LOGS removed numerical extension for all future update logs. Simple code cleanup sql/mysqld.cc: Fixed the --help reports right values for --datadir and --bind-address --log-binary=a.b.c now properly strips of .b.c Removed option --skip-external-locking (not needed as this is automatic) sql/repl_failsafe.cc: Moved some common THD initalization to store_globals() sql/slave.cc: Moved openssl include to avoid problem with installed readline sql/sql_acl.cc: Moved openssl include to avoid problem with installed readline sql/sql_acl.h: Updated function prototypes sql/sql_base.cc: Added comment sql/sql_class.cc: Moved openssl include to avoid problem with installed readline. Changed THD::thd to make things work for main thread. sql/sql_class.h: Fixed wrongly removed line (fixes compiler problem on MacOSX) sql/sql_insert.cc: Moved openssl include to avoid problem with installed readline sql/sql_lex.cc: Moved save_to_cache_query=0 to udf detection function to make sql_yacc.yy simpler sql/sql_lex.h: Indentation cleanup sql/sql_parse.cc: Moved openssl include to avoid problem with installed readline. Added THD argument to acl_reload() sql/sql_repl.h: Made opt_bin_logname static sql/sql_udf.cc: Fix that one can DROP UDF functions that was not loaded at startup sql/sql_yacc.yy: made AND optional in REQUIRE Added REQUIRE NONE Fixed that old SSL options are not forgotten when doing new GRANT. sql/udf_example.cc: Improved comments
* | Update for running gcc 3.x (mainly on HPUX)unknown2002-06-301-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes for HPUX Rename of CHECK_LOCK to IS_FREE_LOCK Apply lower_case_table_names also to databases Cleanup of describe code Don't allow \ in database names Build-tools/Do-compile: Added option --make-options Docs/manual.texi: Changelog Added XOR, ^ and IS_FREE_LOCK() descriptions acinclude.m4: Update for running gcc 3.x on HPUX client/mysql.cc: Portability fix client/mysqlbinlog.cc: Fix for using gcc 3.1 configure.in: Fix for using gcc 3.1 include/my_global.h: Fix for using gcc 3.1 include/my_pthread.h: Removed warning on HPUX innobase/configure.in: Portability fix (for gcc 3.1 on HPUX) innobase/ut/ut0ut.c: Portability fix (for gcc 3.1 on HPUX) mysql-test/r/func_test.result: Test of new functions mysql-test/r/rpl_get_lock.result: Test of new functions mysql-test/t/func_test.test: Test of new functions mysql-test/t/rpl_get_lock.test: Test of new functions mysys/my_tempnam.c: Portability fix sql/item_cmpfunc.cc: Added comments to Item_cond_xor. Fixed NULL handling for XOR sql/item_create.cc: rename of CHECK_LOCK to IS_FREE_LOCK sql/item_create.h: rename of CHECK_LOCK to IS_FREE_LOCK sql/item_func.cc: Cleanup XOR handling sql/item_func.h: rename of CHECK_LOCK to IS_FREE_LOCK sql/lex.h: rename of CHECK_LOCK to IS_FREE_LOCK sql/mysqld.cc: Moved chroot() to be exectued earlier. sql/sql_db.cc: Apply lower_case_table_names also to databases sql/sql_parse.cc: Apply lower_case_table_names also to databases sql/sql_select.cc: Cleanup describe code (after Sinisa's patch for EXPLAIN + UNION) sql/table.cc: Don't allow \ in database names
* | Aesthetic cleanups to acinclude.m4 and configure.in.unknown2002-05-121-2/+2
| | | | | | | | | | | | | | acinclude.m4: Aesthetic cleanups. configure.in: Aesthetic cleanups.
* | Cleanupsunknown2002-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use DBUG library for struct st_my_thread_var to make code less complicated. Docs/manual.texi: Cleanup acinclude.m4: Search after openssl in /usr/local client/mysql.cc: Fix prompt client/mysqladmin.c: Cleanup client/mysqltest.c: Cleanup include/my_pthread.h: Move thread variables to the right location include/my_sys.h: Move thread variables to the right location include/mysql.h: Clean up client prototypes libmysql/libmysql.c: Clean up client prototypes mysys/my_static.h: Cleanup mysys/my_thr_init.c: Don't use DBUG library for struct st_my_thread_var to make code less complicated sql/item_cmpfunc.cc: Small optimization sql/net_pkg.cc: Cleanup sql/sql_parse.cc: Allow VARCHAR(0)
* | mergeunknown2002-03-061-4/+5
|\ \ | |/ | | | | | | | | | | | | | | configure.in: Auto merged Docs/manual.texi: Auto merged libmysql/libmysql.c: Auto merged
| * Fix for --enable-local-infileunknown2002-03-061-5/+5
| | | | | | | | | | | | | | | | | | Docs/manual.texi: Changelog acinclude.m4: Cleanup --help output libmysql/libmysql.c: Fix for reading option groups in client
| * Update to autoconf 2.52unknown2002-02-071-51/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix of InnoDB variables in SHOW VARIABLES Fix for ALTER TABLE and InnoDB BUILD/FINISH.sh: Update to autoconf 2.52 BUILD/SETUP.sh: Update to autoconf 2.52 BUILD/compile-alpha: Update to autoconf 2.52 BUILD/compile-pentium-gcov: Update to autoconf 2.52 BUILD/compile-pentium-gprof: Update to autoconf 2.52 BUILD/compile-pentium: Update to autoconf 2.52 Docs/manual.texi: Changelog acconfig.h: Update to autoconf 2.52 acinclude.m4: Update to autoconf 2.52 bdb/dist/configure.in: Update to autoconf 2.52 client/Makefile.am: Update to autoconf 2.52 configure.in: Update to autoconf 2.52 mysql-test/r/innodb.result: Update of InnoDB Cardinality values mysys/Makefile.am: Update to autoconf 2.52 scripts/Makefile.am: Update to autoconf 2.52 sql/ha_innobase.cc: Fix of InnoDB variables in SHOW VARIABLES sql/ha_innobase.h: Fix of InnoDB variables in SHOW VARIABLES sql/sql_table.cc: Fix for ALTER TABLE and InnoDB support-files/my-huge.cnf.sh: Fixed typo support-files/my-large.cnf.sh: Fixed typo support-files/my-medium.cnf.sh: Fixed typo support-files/my-small.cnf.sh: Fixed typo
* | Update needed for SuSE 7.3unknown2002-01-261-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update for autoconf 2.52 BitKeeper/deleted/.del-compile-pentium-symbols~b1b0f0b465eb15b8: Delete: BUILD/compile-pentium-symbols BUILD/Makefile.am: Remove not used scripts BUILD/SETUP.sh: Update needed for SuSE 7.3 BUILD/compile-alpha: Update needed for SuSE 7.3 BUILD/compile-pentium-debug-no-bdb: Update needed for SuSE 7.3 BUILD/compile-pentium-gcov: Update needed for SuSE 7.3 BUILD/compile-pentium-gprof: Update needed for SuSE 7.3 BUILD/compile-pentium-mysqlfs-debug: Update needed for SuSE 7.3 BUILD/compile-pentium: Update needed for SuSE 7.3 Docs/manual.texi: changelog Docs/mysqld_error.txt: New error messages. acconfig.h: Update to autoconf 2.52 acinclude.m4: Update to autoconf 2.52 bdb/dist/configure.in: Update to autoconf 2.52 configure.in: Update to autoconf 2.52 myisam/mi_check.c: Fix for myisamchk bug when reparing table with many keys. myisam/mi_key.c: Fix problem with NAN in key's scripts/Makefile.am: Fix for autoconf 2.52 scripts/mysql_new_fix_privilege_tables.sh: cleanup
* | Portability fix.unknown2001-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed linking problem with InnoDB. BUILD/compile-alpha-cxx: Fix for using innodb acinclude.m4: Fix problem with linking mysqld after Heikkis last changes. client/mysql.cc: Fixed linking problem client/mysqlmanager-pwgen.c: Portability fix innobase/que/que0que.c: Removed some blanks myisam/ft_boolean_search.c: Portability fix myisam/sort.c: Portability fix mysys/queues.c: Portability fix strings/ctype-latin1_de.c: Portability fix tools/mysqlmanager.c: Portability fix
* | Fixed processor detection script to be more portableunknown2001-10-301-6/+6
| |
* | Fast fix to support one more possible directory of OpenSSL include files.unknown2001-10-191-1/+2
| |
* | mergeunknown2001-10-101-42/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: Auto merged Build-tools/Do-rpm: Auto merged sql/Makefile.am: Auto merged
| * | Remved Gemini code.unknown2001-10-101-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-ha_gemini.cc~5d72172d33b00c6: Delete: sql/ha_gemini.cc BitKeeper/deleted/.del-ha_gemini.h~4dfccf1929195747: Delete: sql/ha_gemini.h BitKeeper/deleted/.del-gemini.result~89b4f9cced8dfc2f: Delete: mysql-test/r/gemini.result BitKeeper/deleted/.del-gemini.test~51d0362310e55e17: Delete: mysql-test/t/gemini.test BitKeeper/deleted/.del-have_gemini.inc~42f94f0dfd0f7b18: Delete: mysql-test/include/have_gemini.inc BitKeeper/deleted/.del-have_gemini.require~206702c48b2e206b: Delete: mysql-test/r/have_gemini.require BitKeeper/deleted/.del-gemini.dat~a73393a88b124b9f: Delete: mysql-test/std_data/gemini.dat BitKeeper/deleted/.del-isolation.test~6a39e4138dd4a456: Delete: mysql-test/t/isolation.test BitKeeper/deleted/.del-isolation.result~4da11e109a3d93a9: Delete: mysql-test/r/isolation.result acinclude.m4: Remved gemini code. configure.in: Remved gemini code. libmysql/libmysql.c: Remved gemini code. mysql-test/install_test_db.sh: Remved gemini code. scripts/mysql_install_db.sh: Remved gemini code. sql/Makefile.am: Remved gemini code. sql/field.cc: Remved gemini code. sql/field.h: Remved gemini code. sql/handler.cc: Remved gemini code. sql/handler.h: Remved gemini code. sql/lex.h: Remved gemini code. sql/mysqld.cc: Remved gemini code. sql/sql_base.cc: Remved gemini code. sql/sql_class.cc: Remved gemini code. sql/sql_class.h: Remved gemini code. sql/sql_lex.h: Remved gemini code. sql/sql_parse.cc: Remved gemini code. sql/sql_rename.cc: Remved gemini code. sql/sql_table.cc: Remved gemini code. sql/sql_yacc.yy: Remved gemini code.
* | | Add --without-isam configure switch.unknown2001-10-091-0/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fix for mysqlmanager. acconfig.h: Add HAVE_ISAM acinclude.m4: Add --without-isam configure switch. configure.in: Add --without-isam configure switch. include/my_global.h: remove #define HAVE_ISAM libmysqld/examples/test-run: pass --language option to embedded server sql/Makefile.am: use @isam_libs@ instead of hard-coded values tools/mysqlmanager.c: #include <signal.h> for portability
* | mergeunknown2001-10-081-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union acinclude.m4: Auto merged Docs/manual.texi: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged libmysqld/libmysqld.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/t/count_distinct2.test: Auto merged mysql-test/t/flush.test: Auto merged mysql-test/t/rpl000017.test: Auto merged libmysql/libmysql.c: Auto merged mysys/Makefile.am: Auto merged sql/Makefile.am: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged libmysqld/Makefile.am: Added back md5.c
| * | Updated manual about embedded version.unknown2001-10-081-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up column-completion in 'mysql' Don't use ISAM if HAVE_ISAM is not defined A lot of fixes for the embedded version. All libraries are now included in libmysqld.a Changed arguments to convert_dirname() to make it more general. Renamed files in the 'merge' directory to all use a common prefix. Don't compile both assembler and C functions on x86 BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7: Delete: mysys/mf_pack2.c Docs/manual.texi: Updated chapter about embedded version acinclude.m4: Fix for using BDB and InnoDB with embedded client/completion_hash.cc: Speed up memory allocation client/completion_hash.h: Speed up memory allocation client/mysql.cc: Speed up memory allocation client/mysqldump.c: Fix to use now convert_dirname client/mysqltest.c: Fixed memory allocation bugs. Added --basedir=#, --compress=#, --server-arg, --server-file. Fixes for embedded version Changed silent mode to -s instead of -q include/my_global.h: Update to use HAVE_ISAM include/my_sys.h: Cleanup of fn_format() include/mysql.h: Prepare FIELD struct for 4.1 include/mysql_embed.h: Don't use ISAM in embedded version innobase/include/srv0srv.h: Make InnoDB startup/shutdown silent in embedded version innobase/log/log0log.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0srv.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0start.c: Make InnoDB startup/shutdown silent in embedded version isam/isamlog.c: new convert_dirname libmysql/libmysql.c: Prepare for 4.1 libmysqld/Makefile.am: Changed to create one libmysqld.a file that includes all other libraries. libmysqld/examples/Makefile.am: Changed to use new libmysqld.a libmysqld/examples/test-run: Lot's of fixes to get new mysqltest with embedded MySQL to work. libmysqld/lib_sql.cc: Changed type of arguments for mysql_server_init() to make code more portable. libmysqld/libmysqld.c: Cleanup merge/Makefile.am: Rename to use common prefix. merge/mrg_close.c: Rename to use common prefix. merge/mrg_create.c: Rename to use common prefix. merge/mrg_def.h: Rename to use common prefix. merge/mrg_delete.c: Rename to use common prefix. merge/mrg_extra.c: Rename to use common prefix. merge/mrg_info.c: Rename to use common prefix. merge/mrg_locking.c: Rename to use common prefix. merge/mrg_open.c: Rename to use common prefix. merge/mrg_panic.c: Rename to use common prefix. merge/mrg_rrnd.c: Rename to use common prefix. merge/mrg_rsame.c: Rename to use common prefix. merge/mrg_static.c: Rename to use common prefix. merge/mrg_update.c: Rename to use common prefix. myisam/myisamlog.c: Use new convert_dirname myisammrg/Makefile.am: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_close.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_create.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_def.h: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_delete.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_extra.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_info.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_locking.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_open.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_panic.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_queue.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rfirst.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rkey.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rlast.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rnext.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rprev.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rrnd.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rsame.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_static.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_update.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_write.c: Renamed mymrgdef.h -> myrg_def.h mysql-test/include/master-slave.inc: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/mysql-test-run.sh: cleanup mysql-test/r/auto_increment.result: Cleanup of tests for embedded version mysql-test/r/func_system.result: Cleanup of tests for embedded version mysql-test/r/isam.result: Cleanup of tests for embedded version mysql-test/r/lock.result: Cleanup of tests for embedded version mysql-test/r/show_check.result: Cleanup of tests for embedded version mysql-test/t/auto_increment.test: Cleanup of tests for embedded version mysql-test/t/backup.test: Cleanup of tests for embedded version mysql-test/t/count_distinct2-master.opt: Cleanup of tests for embedded version mysql-test/t/count_distinct2.test: Cleanup of tests for embedded version mysql-test/t/create.test: Cleanup of tests for embedded version mysql-test/t/flush.test: Cleanup of tests for embedded version mysql-test/t/func_system.test: Cleanup of tests for embedded version mysql-test/t/isam.test: Cleanup of tests for embedded version mysql-test/t/kill.test: Cleanup of tests for embedded version mysql-test/t/lock.test: Cleanup of tests for embedded version mysql-test/t/order_fill_sortbuf-master.opt: Cleanup of tests for embedded version mysql-test/t/rpl000015.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000016.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000017.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000018.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/show_check.test: Move ISAM specific tests to isam.test mysql-test/t/status.test: Cleanup of tests for embedded version mysql-test/t/tablelock.test: Cleanup mysys/Makefile.am: Removed not used mf_pack2.c mysys/charset.c: new convert_dirname mysys/default.c: new convert_dirname mysys/mf_dirname.c: Changed convert_dirname() to be more general mysys/mf_format.c: Changed bit flags to fn_format() to defines. Added handling of relative filenames BitKeeper/etc/ignore: Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list mysys/mf_pack.c: new convert_dirname mysys/mf_tempfile.c: new convert_dirname scripts/Makefile.am: Adde mysql_explain_log scripts/mysql_config.sh: Added support of --libmysqld-libs sql/Makefile.am: Fix to use 'innodb_system_libs' sql/ha_innobase.cc: Make InnoDB startup/shutdown silent in embedded version sql/ha_isam.cc: Added handling of HAVE_ISAM sql/ha_isammrg.cc: Added handling of HAVE_ISAM sql/ha_myisam.cc: Handle relative paths; Needed to support BACKUP TABLE in embedded version sql/ha_myisammrg.cc: Rename of filenames sql/handler.cc: Added handling of HAVE_ISAM sql/item_func.cc: Fix for ecc (Intel Compiler) sql/mysql_priv.h: Added global variable 'mysql_embedded' sql/mysqld.cc: Use HAVE_ISAM sql/sql_parse.cc: Use new convert_dirname sql/sql_select.cc: Fix for ecc (Intel Compiler) sql/sql_table.cc: Added handling of relative filenames strings/Makefile.am: Don't compile both assembler and C functions on x86 strings/bchange.c: cleanup
| * | Fixed some build problems.unknown2001-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix that compressed packets and normal packets looks indentical before calling net_real_write() (Needed for query cache) Optimize IS NULL handling Build-tools/Do-compile: Fix for machines with clocks in an earlier timezone Docs/manual.texi: Fixed typo acinclude.m4: Fixed typo client/mysqlbinlog.cc: Cleanup client/mysqltest.c: Added --compress to test the compressed protocol configure.in: Increment shared library number (because structs changed) include/mysql.h: Optimize structs for Ia64 include/mysql_com.h: Optimize structs for Ia64 libmysql/libmysql.c: Portability fixes libmysql/net.c: Fix that compressed packets and normal packets looks indentical before calling net_real_write() (Needed for query cache) libmysqld/examples/Makefile.am: Portability fix libmysqld/libmysqld.c: Portability fixes mysql-test/mysql-test-run.sh: Added --compress to test the compressed protocol mysql-test/t/type_enum.test: A mysys/mf_casecnv.c: Portability fixes mysys/mf_tempfile.c: Portability fixes scripts/make_binary_distribution.sh: Add libmysqld to binary distribution sql-bench/server-cfg.sh: Fix for Interbase sql/item.h: Optimize IS NULL handling sql/item_cmpfunc.cc: Optimize IS NULL handling sql/item_cmpfunc.h: Optimize IS NULL handling sql/item_func.cc: cleanup sql/item_func.h: Optimize IS NULL handling sql/mysql_priv.h: c sql/net_serv.cc: Fix that compressed packets and normal packets looks indentical before calling net_real_write() (Needed for query cache)
* | | SSL fixunknown2001-10-051-1/+1
| | | | | | | | | | | | | | | acinclude.m4: When libssl.so was installed from RPM and libssl.a from source libssl.a detection worked properly. Fixed.
* | | changes to make things work in the max versionunknown2001-10-041-9/+35
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | acinclude.m4: automatically detect installation paths of OpenSSL instead of hard-coding automatically enable --with-vio if --with-openssl is enabled client/mysqltest.c: fixes for embedded library libmysqld/Makefile.am: md5 is now in mysys libmysqld/libmysqld.c: added my_connect(), but now can be removed - will do in the next changeset mysql-test/include/have_bdb.inc: disable query log so that result file will not have unneeded show variables mysql-test/include/have_gemini.inc: disable query log so that result file will not have unneeded show variables mysql-test/include/have_innodb.inc: disable query log so that result file will not have unneeded show variables mysql-test/include/have_openssl.inc: disable query log so that result file will not have unneeded show variables mysql-test/include/have_openssl_1.inc: disable query log so that result file will not have unneeded show variables mysql-test/include/have_openssl_2.inc: disable query log so that result file will not have unneeded show variables mysql-test/r/bdb.result: fix for new format mysql-test/r/have_openssl.require: ssl->openssl mysql-test/r/innodb.result: fix for query logging
* | Portability fixunknown2001-09-301-1/+2
| | | | | | | | | | strings/Makefile.am: Add missing ctype-latin1_de.cc
* | Merge work.mysql.com:/home/bk/mysql-4.0unknown2001-09-301-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into volk.internalnet:/home/tonu/mysql-4.0 acinclude.m4: Auto merged sql/mysqld.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/structs.h: Auto merged Docs/manual.texi: Auto merged