summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-07-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/select.result: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged sql/des_key_file.cc: Auto merged sql/field_conv.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/select.test: Resolve conflicts scripts/mysqld_safe.sh: Resolve conflict sql/item.cc: Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR can be longer in 5.0 than 4.1. sql/log_event.cc: Resolve conflict sql/mysql_priv.h: Resolve conflict sql/mysqld.cc: Remove incorrect fix (merge from 4.1) sql/sql_show.cc: Resolve conflict
| * perror.c:unknown2005-07-191-1/+1
| | | | | | | | | | | | | | | | BUG#11999, incorrect --help on perror with ndb extra/perror.c: BUG#11999, incorrect --help on perror with ndb
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-182-32/+35
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-5.0 client/mysqldump.c: Auto merged include/my_sys.h: Auto merged mysys/Makefile.am: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged sql/sql_select.cc: Auto merged mysys/default.c: SCCS merged
| * | Cleanups during reviewunknown2005-07-182-32/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed defaults option --instance to --defaults-group-suffix Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX mysql_print_defaults now understands --defaults-group-suffix Remove usage of my_tempnam() (not safe function) if( -> if ( and while( to while ( BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f: Delete: mysys/my_tempnam.c VC++Files/client/mysqlclient.dsp: Remove not used file my_tempnam.c VC++Files/client/mysqlclient_ia64.dsp: Remove not used file my_tempnam.c VC++Files/libmysql/libmysql.dsp: Remove not used file my_tempnam.c VC++Files/libmysql/libmysql_ia64.dsp: Remove not used file my_tempnam.c VC++Files/mysys/mysys.dsp: Remove not used file my_tempnam.c VC++Files/mysys/mysys_ia64.dsp: Remove not used file my_tempnam.c client/mysql.cc: Change to use get_defaults_options() Remove compiler warnings client/mysqldump.c: Indentation fixes Use quoted table name for 'primary_key_fields' extra/my_print_defaults.c: Add support for --defaults-group-suffix change to use get_default_options() extra/replace.c: Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c include/config-win.h: Added DEFAULT_GROUP_SUFFIX_ENV include/my_sys.h: Change defaults_instance -> defaults_group_suffix Change get_defaults_files -> get_defaults_options libmysql/Makefile.shared: Added DEFAULT_GROUP_SUFFIX_ENV mysys/Makefile.am: Added DEFAULT_GROUP_SUFFIX_ENV Remove my_tempnam.c mysys/default.c: Changed --instance to --defaults-group-suffix Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am (mysys shouldn't by MySQL independent) Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order mysys/default_modify.c: Optimized code to use allocated space more efficently Reduce code size Ensure that realloc() works independent of argument size mysys/my_bitmap.c: Added missing return sql/ha_innodb.cc: Change if( -> if ( sql/ha_ndbcluster.cc: Change while( -> while ( sql/item_cmpfunc.cc: Break loop early (simple optimization) sql/item_strfunc.cc: Change if( -> if ( sql/log.cc: Fixed comment sql/mysqld.cc: Change if( -> if ( sql/opt_range.cc: while( -> while ( if( -> if ( sql/parse_file.cc: Change if( -> if ( sql/sql_cache.cc: while( -> while ( sql/sql_parse.cc: Change if( -> if ( sql/sql_prepare.cc: Added comment sql/sql_select.cc: while( -> while ( Removed index variable by incrementing pointer sql/sql_show.cc: Change if( -> if ( sql/sql_yacc.yy: Change if( -> if ( tests/mysql_client_test.c: Added cast to first argument to bzero()
* | | Mergeunknown2005-07-061-3/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09: Auto merged BitKeeper/deleted/.del-Makefile.am~41238af048e60515: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged tests/Makefile.am: Auto merged vio/Makefile.am: SCCS merged
| * Makefile.am:unknown2005-07-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir client/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir cmd-line-utils/libedit/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir dbug/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir extra/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir heap/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir isam/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysql/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysql_r/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysqld/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir libmysqld/examples/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir merge/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir myisam/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir myisammrg/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir mysql-test/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir mysys/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir netware/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir regex/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir sql/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir strings/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir tests/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir vio/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir tools/Makefile.am: Added -I$(top_builddir)/include for searching generated header files, when builddir != srcdir
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-07-0122-48/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with latest yaSSL. It includes fix for bigendian/littleendian problem (fixes func_encrypt test failure). Our trees are in sync now. extra/yassl/include/yassl_types.hpp: Merge with latest yaSSL. extra/yassl/src/Makefile.am: Merge with latest yaSSL. extra/yassl/src/buffer.cpp: Merge with latest yaSSL. extra/yassl/src/cert_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/lock.cpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/socket_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/template_instnt.cpp: Merge with latest yaSSL. extra/yassl/src/timer.cpp: Merge with latest yaSSL. extra/yassl/src/yassl_error.cpp: Merge with latest yaSSL. extra/yassl/src/yassl_int.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/types.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/Makefile.am: Merge with latest yaSSL. extra/yassl/taocrypt/src/aestables.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/algebra.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/arc4.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/coding.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/file.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/misc.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/random.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/template_instnt.cpp: Merge with latest yaSSL.
* | Fix for Intel compilerunknown2005-06-271-1/+2
| |
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | Fix for "multiple definition of __cxa_pure_virtual" link failure when compiling with icc. extra/yassl/taocrypt/include/runtime.hpp: Do not define __cxa_pure_virtual for ICC. Fixes "multiple definition of __cxa_pure_virtual" link failure on production.
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-2211-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GCC 4.0 link failure. Better CXX_VERSION guessing. config/ac-macros/misc.m4: Better CXX_VERSION guessing. configure.in: CXX_VERSION guessing moved to misc.m4. HAVE_EXPLICIT_TEMPLATE_INSTANTIATION moved to config.h. Use compiler AR with MIPSpro and Forte instead of instantiating templates explicitly. extra/yassl/src/crypto_wrapper.cpp: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. extra/yassl/src/template_instnt.cpp: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. extra/yassl/src/yassl_int.cpp: GCC 4.0 link fix. This file needs __cxa_pure_virtual. extra/yassl/taocrypt/include/runtime.hpp: Fix GCC 4.0 link failure. Instruct compiler to always emit __cxa_pure_virtual even if it seems to be never used. extra/yassl/taocrypt/include/types.hpp: Include config.h. extra/yassl/taocrypt/src/algebra.cpp: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. extra/yassl/taocrypt/src/dh.cpp: GCC 4.0 link fix. This file needs __cxa_pure_virtual. extra/yassl/taocrypt/src/dsa.cpp: GCC 4.0 link fix. This file needs __cxa_pure_virtual. extra/yassl/taocrypt/src/integer.cpp: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. extra/yassl/taocrypt/src/rsa.cpp: GCC 4.0 link fix. This file needs __cxa_pure_virtual. extra/yassl/taocrypt/src/template_instnt.cpp: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/field.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/item.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/item_buff.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/mysqld.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/opt_range.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/set_var.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/slave.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/sql_acl.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/sql_class.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/sql_insert.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/sql_map.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/sql_select.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/sql_show.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION. sql/table.cc: EXPLICIT_TEMPLATE_INSTANTIATION renamed to HAVE_EXPLICIT_TEMPLAE_INSTANTIATION.
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-197-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++. These compilers have problem with implicit template instantiation in archives (libyassl.a, libtaocrypt.a). Instantiate templates explicitly. Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines __cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined. configure.in: Better CXX_VERSION guessing. EXPLICIT_TEMPLATE_INSTANTIATION macro indicates whether to instantiate templates explicitly. Instantiate templates explicitly on MIPSpro, Compaq, Forte. extra/yassl/src/crypto_wrapper.cpp: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. extra/yassl/src/template_instnt.cpp: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. More portable templates instantiation. extra/yassl/src/yassl_int.cpp: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. More portable templates instantiation. extra/yassl/taocrypt/include/runtime.hpp: Fix for link failure on powermacg5 (gcc 3.3). __cxa_pure_virtual must never be inlined. extra/yassl/taocrypt/src/algebra.cpp: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. extra/yassl/taocrypt/src/integer.cpp: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. extra/yassl/taocrypt/src/template_instnt.cpp: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/field.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/item.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/item_buff.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/mysqld.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/opt_range.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/set_var.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/slave.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/sql_acl.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/sql_class.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/sql_insert.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/sql_map.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/sql_select.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/sql_show.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION. sql/table.cc: Replace __GNUC__ by EXPLICIT_TEMPLATE_INSTANTIATION.
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-162-2/+16
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-162-2/+16
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| | * | gcc 2.96 fixes (workarounds for compiler bugs in namespace handling)unknown2005-06-152-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/include/yassl_int.hpp: gcc 2.96 fixes extra/yassl/include/yassl_types.hpp: gcc 2.96 fixes
* | | | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-1615-77/+86
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with latest yaSSL. extra/yassl/include/lock.hpp: Merge with latest yaSSL. extra/yassl/include/socket_wrapper.hpp: Merge with latest yaSSL. extra/yassl/mySTL/helpers.hpp: Merge with latest yaSSL. extra/yassl/src/lock.cpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/socket_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/ssl.cpp: Merge with latest yaSSL. extra/yassl/src/timer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/misc.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/random.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/types.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/asn.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/misc.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/random.cpp: Merge with latest yaSSL.
* | | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-151-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | Fix for link failures on boxes with non-gnu compiler. Fix for compilation failure on hpux11. extra/yassl/taocrypt/src/misc.cpp: Adjust __HP_aCC value to solve compilation problem on hpux11. tools/Makefile.am: Add a dummy C++ file to mysqltestmanager to make libtool use a C++ linker: this lets mysqltestmanager link when using yaSSL and a non-gcc C++ compiler.
* | Mergeunknown2005-06-1124-309/+338
|\ \ | | | | | | | | | | | | | | | | | | mysql-test/Makefile.am: Auto merged extra/yassl/taocrypt/include/modes.hpp: SCCS merged
| * | Merge with latest yaSSL.unknown2005-06-1024-309/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes IsAligned yaSSL assertion failure. extra/yassl/include/buffer.hpp: Merge with latest yaSSL. extra/yassl/include/factory.hpp: Merge with latest yaSSL. extra/yassl/include/openssl/ssl.h: Merge with latest yaSSL. extra/yassl/include/yassl_int.hpp: Merge with latest yaSSL. extra/yassl/include/yassl_types.hpp: Merge with latest yaSSL. extra/yassl/mySTL/stdexcept.hpp: Merge with latest yaSSL. extra/yassl/src/buffer.cpp: Merge with latest yaSSL. extra/yassl/src/socket_wrapper.cpp: Merge with latest yaSSL. extra/yassl/src/ssl.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/block.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/hash.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/hmac.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/integer.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/modes.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/rsa.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/aes.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/dsa.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/hash.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/md5.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/misc.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/ripemd.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/rsa.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/sha.cpp: Merge with latest yaSSL.
* | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-06-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 sql/mysql_priv.h: Auto merged
| * | | sql/mysql_priv.hunknown2005-06-091-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comments, unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed SELECT_ALL flag moved into this free slot. bdb/dist/configure.ac: don't link bdb with -pthread on FreeBSD extra/yassl/taocrypt/include/modes.hpp: fix alignment in yassl - proper fix is required sql/ha_berkeley.cc: remove unused flag OPTION_INTERNAL_SUBTRANSACTIONS sql/mysql_priv.h: comments, unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed SELECT_ALL flag moved into this free slot.
* | | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-081-2/+3
|/ / | | | | | | | | | | | | | | Fix for yaSSL compilation failure on ia64 platform. extra/yassl/taocrypt/include/types.hpp: Do not use assembler when yaSSL compiled with icc on ia64 platform.
* | Portability fix, mySTL on Sun Forte 5.4.unknown2005-06-061-2/+4
| | | | | | | | | | | | | | | | extra/yassl/mySTL/memory.hpp: Portability fix, mySTL on Sun Forte 5.4: default template arguments that are based on previous template argument don't work, just remove the fancy syntax (non-default second argument is not used anywhere anyway).
* | Futher fixes for aCC.unknown2005-06-061-1/+1
| | | | | | | | | | | | extra/yassl/src/handshake.cpp: Further fixes for aCC: rewrite c-tor invocation to not require any optimization from the compiler.
* | Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX).unknown2005-06-061-1/+2
| | | | | | | | | | | | | | | | | | extra/yassl/taocrypt/src/misc.cpp: Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX): we can remove these 2 ifdefed statements, as new handlers are not used anymore (yaSSL new doesn't throw exceptions and does not calls/resets new handlers as prescribed in the standard), but let's leave it to Todd, now just #ifdef the problematic code.
* | Fix yaSSL compilation failure on ds20 (DEC CXX + Linux)unknown2005-06-062-1/+3
| |
* | yassl template instantiation - don't do too muchunknown2005-06-032-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/my_access.c: remove incorrect fix comments extra/yassl/taocrypt/src/integer.cpp: yassl template instantiation - don't do too much extra/yassl/taocrypt/src/template_instnt.cpp: yassl template instantiation - don't do too much mysys/my_access.c: remove incorrect fix sql/item_func.cc: a couple of comment. assert added.
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-06-032-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | Compilation errors fixes. config/ac-macros/yassl.m4: Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives) extra/yassl/taocrypt/src/integer.cpp: Instantiate more templates (needed by some 64bit boxes). extra/yassl/taocrypt/src/template_instnt.cpp: Instantiate more templates (needed by some 64bit boxes). Move tcArrayDelete to TaoCrypt namespace (more portable).
* | cleanupunknown2005-06-021-1/+1
| | | | | | | | | | | | | | extra/yassl/src/ssl.cpp: unresolved __cxa_pure_virtual sql/item_func.cc: don't call arg[0]->val_xxx() twice
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-05-3147-454/+790
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge with latest yaSSL, move templates instantiation into separate file where it is possible extra/yassl/include/buffer.hpp: merge with latest yaSSL extra/yassl/include/crypto_wrapper.hpp: merge with latest yaSSL extra/yassl/include/socket_wrapper.hpp: merge with latest yaSSL extra/yassl/include/yassl_imp.hpp: merge with latest yaSSL extra/yassl/include/yassl_types.hpp: merge with latest yaSSL extra/yassl/mySTL/helpers.hpp: merge with latest yaSSL extra/yassl/mySTL/list.hpp: merge with latest yaSSL extra/yassl/mySTL/memory.hpp: merge with latest yaSSL extra/yassl/mySTL/vector.hpp: merge with latest yaSSL extra/yassl/src/Makefile.am: Include template_instnt.cpp into libyassl_a_SOURCES. extra/yassl/src/buffer.cpp: merge with latest yaSSL extra/yassl/src/cert_wrapper.cpp: merge with latest yaSSL extra/yassl/src/crypto_wrapper.cpp: merge with latest yaSSL extra/yassl/src/handshake.cpp: merge with latest yaSSL extra/yassl/src/lock.cpp: merge with latest yaSSL extra/yassl/src/log.cpp: merge with latest yaSSL extra/yassl/src/socket_wrapper.cpp: merge with latest yaSSL extra/yassl/src/ssl.cpp: merge with latest yaSSL extra/yassl/src/timer.cpp: merge with latest yaSSL extra/yassl/src/yassl_error.cpp: merge with latest yaSSL extra/yassl/src/yassl_imp.cpp: merge with latest yaSSL extra/yassl/src/yassl_int.cpp: merge with latest yaSSL extra/yassl/taocrypt/include/algebra.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/asn.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/block.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/hash.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/integer.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/misc.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/modes.hpp: merge with latest yaSSL extra/yassl/taocrypt/include/runtime.hpp: merge with latest yaSSL extra/yassl/taocrypt/src/Makefile.am: Include template_instnt.cpp into libtaocrypt_a_SOURCES. extra/yassl/taocrypt/src/aestables.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/algebra.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/arc4.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/asn.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/coding.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/dh.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/dsa.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/file.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/integer.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/misc.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/random.cpp: merge with latest yaSSL extra/yassl/taocrypt/src/rsa.cpp: merge with latest yaSSL
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-05-255-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge with latest yaSSL, fix compilation error for SSE2 processors. extra/yassl/include/yassl_int.hpp: Merge with latest yaSSL. extra/yassl/src/log.cpp: Merge with latest yaSSL. extra/yassl/src/yassl_int.cpp: Merge with latest yaSSL. extra/yassl/taocrypt/include/integer.hpp: Merge with latest yaSSL. extra/yassl/taocrypt/src/integer.cpp: Fix compilation error for SSE2 processors.
* | Upgrade yaSSL to 0.9.9.unknown2005-05-2528-715/+283
| |
* | misc.hpp:unknown2005-05-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check _LONGLONG_TYPE as well, to define 'word64', to make it work on Solaris 10 x86_64. Can't assume all x86_64 share the same assembler syntax. For now disabled assembler for x86_64 and Solaris. extra/yassl/taocrypt/include/misc.hpp: Check _LONGLONG_TYPE as well, to define 'word64', to make it work on Solaris 10 x86_64. Can't assume all x86_64 share the same assembler syntax. For now disabled assembler for x86_64 and Solaris.
* | yaSSL fixes for Sun Forte 7unknown2005-05-203-3/+10
| | | | | | | | | | | | | | | | | | extra/yassl/include/yassl_types.hpp: A fix for Sun Forte 7 extra/yassl/mySTL/helpers.hpp: Better comment for the previous fix. extra/yassl/mySTL/list.hpp: A fix for Sun Forte 7
* | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-05-2011-15/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/svoj/devel/mysql/mysql-5.0-build extra/yassl/mySTL/helpers.hpp: Auto merged
| * | WL#2286 - Compile MySQL w/YASSL supportunknown2005-05-2012-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Portability fixes extra/yassl/include/buffer.hpp: Use assert.h instead of less portable cassert extra/yassl/include/log.hpp: Use stdio.h instead of less portable cstdio extra/yassl/include/socket_wrapper.hpp: Use assert.h instead of less portable cassert extra/yassl/mySTL/helpers.hpp: Use stdlib.h instead of less portable cstdlib extra/yassl/mySTL/stdexcept.hpp: Use string.h instead of less portable cstring extra/yassl/mySTL/vector.hpp: Use assert.h instead of less portable cassert extra/yassl/src/ssl.cpp: Use stdio.h instead of less portable cstdio extra/yassl/taocrypt/include/block.hpp: Use stddef.h instead of less portable cstddef, always use ptrdiff_t instead of less portable std::ptrdiff_t extra/yassl/taocrypt/include/file.hpp: Use stdio.h instead of less portable cstdio extra/yassl/taocrypt/include/integer.hpp: Use string.h instead of less portable cstring extra/yassl/taocrypt/include/runtime.hpp: Use stdlib.h instead of less portable cstdlib extra/yassl/taocrypt/src/dh.cpp: Use math.h instead of less portable cmatch
* | | Fixes for numerous compatibility problems in yaSSL.unknown2005-05-206-12/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/include/openssl/ssl.h: Fix -std=c++98 mode compilation failures. extra/yassl/include/yassl_error.hpp: Fix -std=c++98 mode compilation failures. extra/yassl/include/yassl_types.hpp: Fix -std=c++98 mode compilation failures. extra/yassl/mySTL/helpers.hpp: Fix AIX 5.2 compilation problem. extra/yassl/taocrypt/include/asn.hpp: Fix -std=c++98 mode compilation failures. vio/Makefile.am: Add a dummy C++ file to SSL tests to make libtool use a C++ linker: this lets ssl tests link when using yaSSL and a non-gcc C++ compiler.
* | WL#2286 - Compile MySQL w/YASSL supportunknown2005-05-203-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | compilation fixes extra/yassl/src/cert_wrapper.cpp: yaSSL compilation fix on nocona extra/yassl/taocrypt/include/error.hpp: yaSSL compilation fix extra/yassl/taocrypt/include/misc.hpp: yaSSL compilation fix on many platforms tools/Makefile.am: mysqltestmanager with yaSSL enabled compilation fix on FreeBSD 5.3
* | Fix warnings from iccunknown2005-05-181-38/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added BUILD scripts for icc Fixed (one time) memory leak in grant handling config/ac-macros/misc.m4: Remove warnings flags from icc when compiling with -Werror configure.in: Remove warnings flags from icc when compiling with -Werror extra/replace.c: Fix warnings from icc include/my_dbug.h: Fix warnings from icc sql/gen_lex_hash.cc: Fix warnings from icc sql/mysql_priv.h: Add missing variables sql/mysqld.cc: Fix warnings from icc: - made a lot of variables static - Removing some not used variables - Fixed wrong printf() - removed extern "C" from some functions sql/spatial.h: Fix warnings from icc sql/sql_acl.cc: Fixed memory leak sql/sql_lex.cc: Fix warnings from icc sql/sql_lex.h: Fix warnings from icc
* | Fix FC3 yaSSL compilation problem.unknown2005-05-064-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is about WL#2286 - Compile MySQL w/YASSL support extra/yassl/include/yassl_int.hpp: Use instance as static class member to fix FC compilation problem. extra/yassl/src/yassl_int.cpp: Remove local static variable, use static class member instead. extra/yassl/taocrypt/include/integer.hpp: Use instance as static class member to fix FC compilation problem. extra/yassl/taocrypt/src/integer.cpp: Remove local static variable, use static class member instead.
* | gcc 2.92 compatibilityunknown2005-05-057-28/+34
| | | | | | | | | | | | | | | | | | | | | | config/ac-macros/misc.m4: better USE_MYSYS_NEW detection configure.in: better USE_MYSYS_NEW detection extra/yassl/src/Makefile.am: better USE_MYSYS_NEW detection extra/yassl/taocrypt/include/runtime.hpp: better USE_MYSYS_NEW detection
* | Merge mysql.com:/home/jimw/my/mysql-5.0-5354unknown2005-05-021-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean extra/my_print_defaults.c: Auto merged include/my_sys.h: Auto merged mysys/default.c: Auto merged
| * | Add default configuration files to my_print_defaults usage, andunknown2005-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add handling of configuration file in the Windows shared system directory. (Bug #5354) extra/my_print_defaults.c: Print out list of default files that will be used. include/my_sys.h: Add new my_print_default_files() function. mysys/default.c: Increase MAX_DEFAULT_DIRS to handle shared Windows directory, move the logic for handling the Windows (and OS/2) system directories into init_default_directories(), and generalize handling of configuration file extensions.
* | | Clean up merge from 4.1unknown2005-05-021-1/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged extra/my_print_defaults.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/query_cache.result: Mege results mysql-test/t/lowercase_table.test: Merge tests mysql-test/t/query_cache.test: Merge tests mysys/default.c: Merge from 4.1 sql/sql_cache.cc: Merge sql/sql_parse.cc: Merge from 4.1 sql/sql_table.cc: Merge tests/mysql_client_test.c: Merge
| * | Fix undersized array in my_print_defaults that caused crash on Sun Solarisunknown2005-04-261-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | (and maybe strange results on other platforms). (Bug #9851) extra/my_print_defaults.c: Increase size of tmp_arguments array to actually fit possible values
* | | yassl changeset 2:unknown2005-04-309-41/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 set $USE_MYSYS_NEW even if CXX is g++ yassl bugfixes instantiate all yassl templates explicitly client/Makefile.am: mysqlbinlog as a c++ program may need my_new.cc (if CXX=gcc) no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqladmin.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqlbinlog.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc configure.in: echo should be AC_MSG_WARN or AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 (to restore old behaviour) set $USE_MYSYS_NEW even if CXX is g++ (for yassl, as it can be linked with C programs) remove -DDEFINE_CXA_PURE_VIRTUAL - -DUSE_MYSYS_NEW is enough extra/yassl/mySTL/list.hpp: bugfixes extra/yassl/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/src/crypto_wrapper.cpp: instantiate templates explicitly extra/yassl/src/yassl_imp.cpp: instantiate templates explicitly extra/yassl/src/yassl_int.cpp: instantiate templates explicitly extra/yassl/taocrypt/include/runtime.hpp: use -DUSE_MYSYS_NEW not -DDEFINE_CXA_PURE_VIRTUAL assert in __cxa_pure_virtual remove dummy (and thus dangerous) __cxa_guard_acquire/__cxa_guard_release extra/yassl/taocrypt/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/taocrypt/src/integer.cpp: instantiate templates explicitly extra/yassl/taocrypt/src/rsa.cpp: instantiate templates explicitly include/my_global.h: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc mysys/my_new.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc server-tools/instance-manager/command.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc sql/ha_blackhole.cc: typo fixed sql/ha_innodb.cc: warning fixed sql/item_func.cc: use LL() sql/mysqld.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
* | | WL#2286 Compile MySQL w/YASSL supportunknown2005-04-2898-0/+26988
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yaSSL-0.9.7 library bundled. BUILD/Makefile.am: compile-pentium-debug-yassl added to distribution. Makefile.am: Added yassl_dir to SUBDIRS. It contains path to yassl distribution if --with-yassl specified. It is empty otherwise. configure.in: yaSSL CHECK-function call. extra/Makefile.am: yaSSL added to distribution. include/violite.h: YASSL_MYSQL_COMPATIBLE macro must be defined to make yassl headers compatible.
* | Removed support for RAID, mit-threads, and MySQL FS (really, if someone ↵unknown2005-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wants this feature look at a web-dav hookup). BitKeeper/deleted/.del-mysqlfs.m4~2c0a06625ffdef2: Delete: config/ac-macros/mysqlfs.m4 Makefile.am: Removed fs_dir (since dropping mysqlfs support) configure.in: Removed support for MySQLFS. Gone is support for mit-threads. Gone is Raid. I feel like if I say "gone" one more time I should embed a secret country song somewhere in the source as an easter egg. dbug/Makefile.am: Removed mit-threads extra/Makefile.am: Removed mit-threads heap/Makefile.am: removed mit-threads libmysql_r/Makefile.am: removed mit-threads libmysqld/Makefile.am: removed mit-threads myisam/Makefile.am: remove mt-threads myisammrg/Makefile.am: removed mit-threas mysys/Makefile.am: removed mit-threads regex/Makefile.am: removed mit-treads sql/Makefile.am: removed mit-threads strings/Makefile.am: removed mit-threads tests/Makefile.am: removed mit-threads tools/Makefile.am: removed mit-threads
* | Remove compiler warnings and remove not used variablesunknown2005-02-252-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Found during build process) extra/comp_err.c: Remove compiler warnings extra/perror.c: Remove compiler warnings innobase/dict/dict0dict.c: Remove compiler warnings innobase/dict/dict0load.c: Remove compiler warnings innobase/pars/pars0sym.c: Remove compiler warnings innobase/row/row0row.c: Remove compiler warnings innobase/row/row0sel.c: Remove compiler warnings libmysqld/lib_sql.cc: Remove not used variables myisam/mi_key.c: Remove compiler warnings regex/engine.c: Added comment sql/derror.cc: Remove not used variables sql/examples/ha_archive.cc: Fixed bug in blob handling Removed not used variable sql/field.cc: Remove compiler warnings Remove not used variables sql/filesort.cc: Remove compiler warnings sql/ha_heap.cc: Remove not used variable sql/ha_innodb.cc: Remove not used variables Remove compiler warnings sql/handler.cc: Remove compiler warnings and remove not used variables sql/item.cc: Remove compiler warnings and remove not used variables sql/item_subselect.cc: Remove compiler warnings sql/item_sum.cc: Remove compiler warnings sql/item_sum.h: Remove compiler warnings and remove not used variables sql/log.cc: Remove compiler warnings and remove not used variables sql/log_event.cc: Remove compiler warnings sql/mysqld.cc: Remove compiler warnings and remove not used variables sql/opt_range.cc: Remove compiler warnings and remove not used variables sql/slave.cc: Remove compiler warnings and remove not used variables sql/sp_pcontext.cc: Remove compiler warnings and remove not used variables sql/sql_acl.cc: Remove compiler warnings and remove not used variables sql/sql_analyse.cc: Remove compiler warnings and remove not used variables sql/sql_base.cc: Remove compiler warnings and remove not used variables sql/sql_db.cc: Remove compiler warnings and remove not used variables sql/sql_help.cc: Remove compiler warnings and remove not used variables sql/sql_insert.cc: Remove compiler warnings and remove not used variables sql/sql_load.cc: Remove compiler warnings and remove not used variables sql/sql_parse.cc: Remove compiler warnings and remove not used variables sql/sql_prepare.cc: Remove compiler warnings and remove not used variables sql/sql_select.cc: Remove compiler warnings and remove not used variables sql/sql_show.cc: Remove compiler warnings and remove not used variables sql/sql_table.cc: Remove compiler warnings sql/sql_union.cc: Remove compiler warnings sql/sql_update.cc: Remove compiler warnings and remove not used variables sql/sql_yacc.yy: Remove compiler warnings and remove not used variables sql/strfunc.cc: Remove compiler warnings and remove not used variables strings/ctype-ucs2.c: Remove compiler warnings tests/mysql_client_test.c: Remove compiler warnings and remove not used variables tools/mysqlmanager.c: Remove compiler warnings and remove not used variables
* | Mergeunknown2005-02-221-6/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | extra/perror.c: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Merge change in warning message sql/sql_parse.cc: Hand-merge
| * Merge bk-internal:/home/bk/mysql-4.1unknown2005-02-221-5/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged
View Lorry Controller Status