summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* - fixed typo for better portability (many shells don't support the "=="unknown2003-01-291-1/+1
| | | | | | | operator)
* Only write to the error log if --log-error is specified and --console is not ↵unknown2003-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | specified (On Windows --log-error is enabled by default) mysys/my_getopt.c: Call get_one_option() also for boolean values. scripts/mysqld_safe.sh: Add option --log-error sql/log.cc: Fix for --log-error sql/mysql_priv.h: Fix for --log-error sql/mysqld.cc: Fix for --log-error sql/sql_udf.cc: Lock the mysql/func table properly
* mergeunknown2003-01-281-39/+103
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_sys.h: Auto merged sql/item_create.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged innobase/btr/btr0cur.c: Use local file scripts/make_binary_distribution.sh: Add mysql_waitpid sql/mysqld.cc: Simple cleanup
| * Fixes for Netwareunknown2003-01-281-38/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
| * Merge with 3.23.55unknown2003-01-251-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-net.c~ef21d6402bb882f9: Auto merged innobase/os/os0file.c: Auto merged libmysql/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged Build-tools/Do-compile: Use local version Makefile.am: remove double libmysql_r configure.in: Use local libmysql/libmysql.c: Dont abort connection if too big packet error sql/ha_innodb.cc: use local sql/net_serv.cc: use local sql/sql_parse.cc: Merge with 3.23.55 (fix double free of user)
| | * - merge relevant Do-compile changes from 4.0 treeunknown2003-01-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use "gnutar" on Mac OS X to build the binary distribution Build-tools/Do-compile: - merged relevevant changes from 4.0 (Options no-mysqltest, no-benchmark, log_timestamp function) scripts/make_binary_distribution.sh: - make sure to use "gnutar" (on Mac OS X) to pack up the binary distribution (Mac OS X "tar" seems to be buggy - the resulting tarballs appear to be corrupted, e.g. when opening them with Midnight Commander. GNU tar seems to extract them correctly, though)
* | | - added mysql_waitpid to the MySQL-client RPM and binary distributionsunknown2003-01-241-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | - renamed MySQL.rpm to MySQL-server.rpm scripts/make_binary_distribution.sh: - added mysql_waitpid to binary distribution (required for mysql-test-run) support-files/mysql.spec.sh: - renamed package "MySQL" to "MySQL-server" - fixed Copyright tag - added mysql_waitpid to "client" subpackage (required for mysql-test-run)
* | Merge sinisa@work.mysql.com:/home/bk/mysql-4.0unknown2003-01-213-17/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0 scripts/mysqld_safe.sh: Auto merged sql/net_pkg.cc: Auto merged sql/sql_acl.cc: Auto merged
| * \ Merge with 3.23unknown2003-01-163-17/+27
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/btr/btr0btr.c: Auto merged ltconfig: Auto merged innobase/include/btr0btr.h: Auto merged innobase/log/log0log.c: Auto merged libmysql/Makefile.shared: Auto merged man/isamlog.1: Auto merged man/mysql.1: Auto merged man/mysql_zap.1: Auto merged man/isamchk.1: Auto merged man/mysqlaccess.1: Auto merged man/mysqladmin.1: Auto merged man/mysqld_multi.1: Auto merged man/mysqld.1: Auto merged man/mysqld_safe.1: Auto merged man/mysqldump.1: Auto merged man/mysqlshow.1: Auto merged man/replace.1: Auto merged myisam/mi_unique.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/net_pkg.cc: Auto merged sql/sql_table.cc: Auto merged strings/Makefile.am: Auto merged man/perror.1: Auto merged Makefile.am: merge with 3.23 client/mysqltest.c: merge with 3.23 innobase/btr/btr0pcur.c: merge with 3.23 (use local file) innobase/row/row0purge.c: merge with 3.23 (use local file) scripts/mysql_fix_privilege_tables.sh: Merge with 3.23 (Apply debian patches) sql/ha_innodb.cc: merge with 3.23 (use local file) sql/mysqld.cc: Merge with 3.23 (use local file) sql/net_serv.cc: Merge with 3.23 (use local file) sql/sql_db.cc: Merge with 3.23 (use local file)
| | * - Applied various patches provided by Christian Hammers (MySQL maintainerunknown2002-12-233-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the Debian project) to fix some architecture-specific problems and some bugs Makefile.am: - put current directory (.) at front of SUBDIRS list, so that "distclean" is done last. IF done first, "distclean" in include directory fails because config.h is missing, which is removed by distclean in current directory. (thanks to "jww" for the patch) - make "distclean" in libmysql_r, too (Thanks to Christian Hammers from the Debian project for the patch) bdb/dist/aclocal/mutex.m4: - Sparc patch for mutexes/pthreads from Christopher C. Chimelis and Ben Collins from Debian (thanks to Christian Hammers from the Debian project for forwarding it) bdb/include/mutex.h: - Patch for building on m68k architecture (originally provided by Michael Fedrowitz for Debian Linux, thanks to Christian Hammers from the Debian project for forwarding it) ltconfig: - A hardcoded "rpath" is forbidden by the Debian policy (thanks to Christian Hammers from the Debian project for forwarding this patch) man/isamchk.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/isamlog.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysql.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysql_zap.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqlaccess.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqladmin.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqld.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqld_multi.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/mysqldump.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) - fixed nroff mistake man/mysqlshow.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/perror.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/replace.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) man/safe_mysqld.1: - some syntactical correction in the headlines of the manpages for apropos(1) (Thanks to Christian Hammers from the Debian project for the patch) scripts/mysql_fix_privilege_tables.sh: - fixed some typos - script cleanup scripts/mysqlaccess.sh: - make $script_log path less dependent on the shell scripts/safe_mysqld.sh: - applied patch provided by Debian to enhance security (This way all logs and databases are created world-nothing).
| | * - fixed another typo in NOHUP_NICENESS testingunknown2002-12-131-1/+1
| | |
| | * - added missing "test" to $NOHUP_NICENESS test (thanks to Nick Gaugler forunknown2002-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | spotting and reporting this)
| | * - make sure to replace HOSTNAME in mysql.server when packing up the binaryunknown2002-12-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | distribution (this will still be broken for 3.23.54) - make sure that mysql.server in the binary distribution is executable, too
| | * Rewrote nice handling to make more portableunknown2002-11-241-3/+8
| | |
| | * scripts/safe_mysqld.shunknown2002-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix setting of niceness level support-files/mysql.server.sh - applied some fixes from 4.0 mysql.server script - fix my.cnf parsing scripts/safe_mysqld.sh: - fix setting of niceness level, if one adds "renice -20 $$" to safe_mysqld as hinted in the manual (which could result in NOHUP_NICENESS having a value of "-15" and hence there would be one dash too much) support-files/mysql.server.sh: - applied some fixes from 4.0 mysql.server script - fix to actually parse the documented section ([mysql.server] not [mysql_server]) in my.cnf on startup
* | | A small fix for the type in the scriptunknown2003-01-091-1/+1
|/ /
* | Changed thd variables max_join_size and select_limit to type ha_rows.unknown2002-12-202-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | - moved manual pages from "man" to "man/man1" for the binary distributionunknown2002-12-111-2/+2
| |
* | Merge serg.mysql.com:/usr/home/serg/Abk/mysqlunknown2002-11-171-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 scripts/mysqlhotcopy.sh: Auto merged sql-bench/test-create.sh: Auto merged support-files/mysql.server.sh: Auto merged
| * - Fixed some minor bugs/typosunknown2002-11-151-0/+1
| | | | | | | | | | | | | | | | | | scripts/mysqlhotcopy.sh: - added missing "--host" option sql-bench/test-create.sh: - fixed typo support-files/mysql.server.sh: - fixed typo
* | mergeunknown2002-11-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/bdb.result: Auto merged mysql-test/r/innodb.result: Auto merged sql/sql_select.cc: Merge
| * | Fixed that NULL and 0 returns 0 instead of NULLunknown2002-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL mysql-test/r/bdb.result: Fix results after serges last patch mysql-test/r/innodb.result: Fix results after serges last patch mysql-test/r/null.result: Update for new AND handling of NULL scripts/mysqld_safe.sh: Fix 'isroot' test to work even if user is not root sql/item.h: Fixed that NULL and 0 returns 0 instead of NULL sql/item_cmpfunc.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/item_cmpfunc.h: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_base.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_parse.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_select.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_yacc.yy: Fixed that NULL and 0 returns 0 instead of NULL
* | | Fixed a problem with reading some innodb options that may contain semicolin.unknown2002-11-121-1/+2
|/ /
* | fixed test for "root", on some installations / is mounted read-onlyunknown2002-11-081-1/+1
| |
* | Portability fixes for Fortre C++ 5.0 (on Sun) in 32 and 64 bit modes.unknown2002-11-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlbinlog.cc: Portability fix configure.in: Added use of ASFLAGS (For Solaris with Forte 5.0) include/my_global.h: Portability fix include/myisam.h: Portability fix include/queues.h: Portability fix innobase/include/ut0ut.h: Portability fix innobase/log/log0log.c: Portability fix innobase/rem/rem0cmp.c: Portability fix innobase/trx/trx0sys.c: Portability fix isam/pack_isam.c: Portability fix myisam/ft_boolean_search.c: Portability fix myisam/mi_dynrec.c: Code change to go around bug in Forte 5.0 myisam/sort.c: Portability fix mysys/my_aes.c: Portability fix scripts/Makefile.am: Support for ASFLAGS scripts/mysqlbug.sh: Support for ASFLAGS sql/field.cc: Portability fix sql/filesort.cc: Portability fix sql/gen_lex_hash.cc: Portability fix sql/ha_innodb.cc: Portability fix Changed SHOW INNODB STATUS to return error instead of writing message to log file. sql/ha_isammrg.cc: Portability fix sql/ha_myisam.cc: Portability fix sql/ha_myisammrg.cc: Portability fix sql/hash_filo.h: Portability fix sql/hostname.cc: Portability fix sql/item_cmpfunc.h: Indentation change sql/item_func.cc: Portability fix sql/item_func.h: Portability fix sql/log.cc: Portability fix sql/log_event.cc: Portability fix sql/mysql_priv.h: Portability fix sql/mysqld.cc: Portability fix Fixed bug with rpl_recovery_rank command line option on 64 bit systems sql/opt_range.cc: Portability fix sql/repl_failsafe.cc: Portability fix sql/slave.cc: Portability fix sql/slave.h: Portability fix sql/sql_acl.cc: Portability fix sql/sql_base.cc: Portability fix sql/sql_cache.cc: Portability fix sql/sql_cache.h: Portability fix sql/sql_class.cc: Portability fix sql/sql_delete.cc: Portability fix sql/sql_insert.cc: Portability fix sql/sql_manager.cc: Portability fix sql/sql_parse.cc: Portability fix BUILD/compile-solaris-sparc-forte: C sql/sql_udf.cc: Portability fix sql/sql_update.cc: Portability fix strings/Makefile.am: Portability fix strings/bmove_upp-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/str_test.c: Cleanup strings/strappend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strend-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmake-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strnmov-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strstr-sparc.s: Fix so that this works on 32 and 64 bit sparcs strings/strxmov-sparc.s: Fixes to make this more portable, but it's still not usable on 64 bit systems :( BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | mergeunknown2002-10-291-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | include/my_global.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged
| * | Added --skip-safemalloc to mysqltestunknown2002-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x Small change in EXCHANGE output Propagate open-files-limit from mysqld_safe -> mysqld Fixed speed bug in GROUP BY Added quotes around database name in CREATE DATABASE db_name (for binary log) BitKeeper/etc/ignore: added stamp-h1 Docs/manual.texi: Added 4.1 manual section Updated changelog client/mysqltest.c: Added --skip-safemalloc include/my_global.h: Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x mysql-test/mysql-test-run.sh: Start mysqltest with --skip-safemalloc (To get it faster) mysql-test/r/bdb.result: Update for new EXPLAIN output mysql-test/r/compare.result: Update for new EXPLAIN output mysql-test/r/create.result: Update for new EXPLAIN output mysql-test/r/distinct.result: Update for new EXPLAIN output mysql-test/r/explain.result: Update for new EXPLAIN output mysql-test/r/group_by.result: Update for new EXPLAIN output mysql-test/r/heap.result: Update for new EXPLAIN output mysql-test/r/innodb.result: Update for new EXPLAIN output mysql-test/r/join_outer.result: Update for new EXPLAIN output mysql-test/r/key_diff.result: Update for new EXPLAIN output mysql-test/r/merge.result: Update for new EXPLAIN output mysql-test/r/null_key.result: Update for new EXPLAIN output mysql-test/r/order_by.result: Update for new EXPLAIN output mysql-test/r/select.result: Update for new EXPLAIN output mysql-test/r/temp_table.result: Fixed speed bug in GROUP BY mysql-test/r/type_datetime.result: Update for new EXPLAIN output mysql-test/r/user_var.result: Update for new EXPLAIN output mysql-test/r/variables.result: Removed variable safe_show_database mysql-test/t/temp_table.test: Fixed speed bug in GROUP BY mysql-test/t/variables.test: Removed not used variable safe_show_databases scripts/mysqld_safe.sh: Propagate open-files-limit from mysqld_safe -> mysqld sql/mysqld.cc: Removed variable safe_show_database sql/set_var.cc: Removed variable safe_show_database sql/slave.cc: Updated error message sql/sql_db.cc: Added quotes around database name in CREATE DATABASE db_name sql/sql_select.cc: Fixed speed bug in GROUP BY
* | | mergedunknown2002-10-252-4/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-skipkeys~53ffbfa7d2fa9fb: Delete: BitKeeper/etc/skipkeys BitKeeper/etc/skipkeys: Rename: BitKeeper/deleted/.del-skipkeys~f623848ba4db5c3 -> BitKeeper/etc/skipkeys Build-tools/Do-compile: Auto merged Docs/manual.texi: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0grm.c: Auto merged mysys/my_init.c: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/nt_servc.cc: Auto merged sql/nt_servc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/t/bdb-crash.test: Auto merged
| * - added "darwin" to the list of systems that are known to support theunknown2002-10-211-3/+3
| | | | | | | | | | | | | | | | | | -p option for cp and the -r option for scp (thank to Paul DuBois for the patch) - fixed a typo
| * - fixed typo in scripts/mysql_convert_table_format.shunknown2002-10-181-1/+1
| | | | | | | | | | scripts/mysql_convert_table_format.sh: - fixed typo (spotted by Engin Gunduz)
* | Fixed three bugs in mysqlcheck and changed documentation for mysqld_multiunknown2002-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqlcheck.c: Fixed three bugs in mysqlcheck: 1. mysqlcheck died with error Got error: 1103: Incorrect table name when executing 'REPAIR TABLE' 2. --auto-repair used together with --all-in-1 (-1) tried to fix next table in a row, independent whether the next table was OK or corrupted, in case an error was found from a previous table and the previous table remained unfixed. 3. --auto-repair didn't work at all when -1 option wasn't used; broken tables were not noticed at all. scripts/mysqld_multi.sh: Changed documentation
* | Merge with 3.23.54unknown2002-10-161-1/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8: Auto merged BitKeeper/deleted/.del-MySQLEULA.txt: Delete: Docs/MySQLEULA.txt BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Auto merged Build-tools/mysql-copyright-2: Auto merged Build-tools/mysql-copyright: Auto merged heap/heapdef.h: Auto merged heap/hp_open.c: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/os/os0file.c: Auto merged innobase/os/os0thread.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/t/null_key.test: Auto merged mysys/safemalloc.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysqld_safe.sh: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.h: Auto merged sql/item.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged tests/grant.res: Auto merged Build-tools/Do-compile: merge Docs/manual.texi: merge configure.in: merge mysql-test/r/distinct.result: merge mysql-test/r/null_key.result: merge sql/ha_innodb.cc: merge sql/item.h: merge sql/log.cc: merge sql/mysqld.cc: merge support-files/mysql.spec.sh: merge
| * - Tagged ChangeSet 1.1224 as "mysql-3.23.53"unknown2002-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - bumped up version number to 3.23.54 in configure.in - replaced Docs/LICENSE with Docs/MySQLEULA.txt and modified scripts/make_binary_distribution.sh and Build-tools/mysql-copyright* accordingly. BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8: Delete: Docs/LICENSE Build-tools/mysql-copyright-2: - replaced LICENSE with MySQLEULA.txt Build-tools/mysql-copyright: - use "tar" instead of "gtar" - replaced LICENSE with MySQLEULA.txt configure.in: - Bumped up version number to 3.23.54 now that 3.23.53 has been tagged scripts/make_binary_distribution.sh: - replaced LICENSE with MySQLEULA.txt
| * Merge work:/my/mysql-3.23 into mashka.mysql.fi:/home/my/mysql-3.23unknown2002-10-081-1/+5
| |\
| | * Fixed missing table_list->name -> table_list->alias convertunknown2002-10-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | myisam/mi_open.c: Fixed problem with wrongly calculated max_data_file_length mysql-test/Makefile.am: Added missing .require test files scripts/mysqlhotcopy.sh: Remove end / from directory names (portability fix) tests/grant.res: Update of test results
| * | fix for a small typo in the last pushunknown2002-10-071-1/+1
| | | | | | | | | | | | | | | scripts/safe_mysqld.sh: fix for a small type
| * | Small fix in mysqld_safe for some shellsunknown2002-10-051-2/+2
| | |
| * | - Small fix for support-files/mysql.spec.shunknown2002-10-021-3/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated scripts/make_binary_distribution.sh to include the correct ChangeLog and the LICENSE file for non-GPL builds scripts/make_binary_distribution.sh: - Add BK ChangeLog (if existing) instead of sql/ChangeLog, which is not updated anymore since we switched to BK - Add LICENSE, if exists (required for non-GPL binary builds) support-files/mysql.spec.sh: - MySQL-Max now requires MySQL to be the same version (to avoid version mismatches e.g. mixing 3.23.xx and 4.0 packages)
* | - replaced Docs/LICENSE with Docs/MySQLEULA.txtunknown2002-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Updated scripts/make_binary_distribution and scripts/mysql-copyright* accordingly BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8: Delete: Docs/LICENSE BitKeeper/deleted/.del-MySQLEULA.doc~e7fa298916345cf3: Delete: Docs/MySQLEULA.doc Build-tools/mysql-copyright-2: - replaced LICENSE with MySQLEULA.txt Build-tools/mysql-copyright: - replaced LICENSE with MySQLEULA.txt scripts/make_binary_distribution.sh: - replaced LICENSE with MySQLEULA.txt
* | a fix for the typo in the last pushunknown2002-10-071-1/+1
| |
* | a small fix for some shellsunknown2002-10-051-2/+2
| |
* | - small modification to scripts/make_binary_distribution.sh (add theunknown2002-10-021-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | up-to-date BK changelog instead of sql/ChangeLog, add LICENSE if available) scripts/make_binary_distribution.sh: - Don't include sql/ChangeLog in the binary distribution (it's not updated anymore since we've moved to BK) - Include the BK ChangeLog from top level directory instead, if it exists - also add the LICENSE file to the binary distribution, if it exists (required for the non-GPL builds)
* | Don't give the anonymous user create temp table or lock tables privileges.unknown2002-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SET PASSWORD=... closed connection on error. Docs/manual.texi: Changelog mysql-test/r/rpl_rotate_logs.result: Fixed test scripts/mysql_fix_privilege_tables.sh: Don't give the anonymous user create temp table or lock tables privileges. sql/set_var.cc: SET PASSWORD=... closed connection on error, because MySQL sent the error message twice. sql/set_var.h: SET PASSWORD=... closed connection on error, because MySQL sent the error message twice. sql/sql_acl.cc: Added function comment sql/sql_db.cc: Change type of variable sql/sql_parse.cc: SET PASSWORD=... closed connection on error, because MySQL sent the error message twice. tests/grant.pl: Updated grant test case to work with latest MySQL version tests/grant.res: updated test results
* | fixed so that --ssl and --skip-ssl works with the MySQL clients.unknown2002-09-172-384/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed core dump bug when sending wrong string to AES_DECRYPT() BitKeeper/deleted/.del-explain_log.sh~e570be5f63576fe1: Delete: scripts/explain_log.sh Docs/manual.texi: Updated bug reporting. Added somew new changelog entries and changed some old client/mysql.cc: Fixed so that --ssl and --skip-ssl works client/mysqladmin.c: Fixed so that --ssl and --skip-ssl works client/mysqlcheck.c: Fixed so that --ssl and --skip-ssl works client/mysqldump.c: Fixed so that --ssl and --skip-ssl works client/mysqlimport.c: Fixed so that --ssl and --skip-ssl works client/mysqlshow.c: Fixed so that --ssl and --skip-ssl works include/sslopt-case.h: Fixed so that --ssl and --skip-ssl works mysql-test/r/func_str.result: Test of problem with AES_DECRYPT() mysql-test/t/func_str.test: Test of problem with AES_DECRYPT() mysys/my_aes.c: Fixed problem with wrong decrypt string. scripts/mysql_explain_log.sh: Applied missed patch sql/item_strfunc.cc: Fixed aes_encrypt() and aes_decrypt() to be safer and avoid some mallocs() sql/net_pkg.cc: Return ER_UNKNOWN_ERROR instead of errocode 0 in some cases.
* | Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tablesunknown2002-09-162-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in SELECT ... ORDER BY ... LIMIT Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names Fixed hang when using --with-openssl Docs/manual.texi: Updated SHOW VARIABLES Changelog Moved some missplaced changelog entries include/violite.h: updated prototypes libmysqld/lib_sql.cc: Moved init_update_queries() to sql_parse.cc mysql-test/install_test_db.sh: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables mysql-test/r/grant.result: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables mysql-test/t/grant.test: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables scripts/mysql_fix_privilege_tables.sh: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables scripts/mysql_install_db.sh: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables sql/filesort.cc: Fixed bug in SELECT ... ORDER BY ... LIMIT sql/mysql_priv.h: New prototypes sql/mysqld.cc: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host tables sql/sql_acl.cc: Moved init_update_queries() to sql_parse.cc Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host sql/sql_acl.h: Added CREATE TEMPORARY TABLES and LOCK TABLES to db and host sql/sql_parse.cc: Moved init_update_queries() to sql_parse.cc sql/sql_show.cc: Fixed wrong output in SHOW TABLE STATUS for compressed tables. sql/sql_table.cc: Fixed bug in ALTER TABLE and RENAME TABLE with --lower-case-table-names vio/viosocket.c: Fixed hang when using --with-openssl vio/viossl.c: Fixed hang when using --with-openssl
* | Give better error from reconnect()unknown2002-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed hang in start_slave_threads() when thread dies quickly. Docs/manual.texi: Changelog client/mysqltest.c: Indentation cleanup More DBUG info libmysql/libmysql.c: More DBUG info Give better error from reconnect() mysql-test/r/rpl_rotate_logs.result: Update results mysql-test/t/rpl_log_pos.test: Fix for fast machines mysql-test/t/rpl_rotate_logs.test: Updated test to be more portable scripts/mysql_zap.sh: Update for MacOSX sql/mini_client.cc: Better error messages from reconnect. Indentation cleanups sql/slave.cc: Fixed hang in start_slave_threads() when thread dies quickly. sql/slave.h: Fixed hang in start_slave_threads() when thread dies quickly.
* | Portabilityfix in mysqladmin.cunknown2002-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix when using --localstatedir Cleaned up mysql.server Build-tools/Do-compile: Remove test file timestamp2 Docs/manual.texi: Changelog client/mysqladmin.c: Portability fix scripts/make_binary_distribution.sh: Fix for mysql.server sql/mysqld.cc: Fix when using --localstatedir support-files/mysql.server.sh: More comments for usage of 'basedir'
* | Fixunknown2002-08-141-1/+1
| |
* | Added nety_retry_count as a changeable variableunknown2002-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make safe_mysqld a symlink to mysqld_safe in binary distribution Fixed problem with CTRL-C when using mysqld --bootstrap Docs/manual.texi: Added nety_retry_count as a changeable variables include/mysql_com.h: Added nety_retry_count as a changeable variables libmysql/libmysql.c: Added nety_retry_count as a changeable variables mysql-test/r/olap.result: Fixed wrong error message mysql-test/r/variables.result: Update for freebsd mysql-test/t/variables.test: Update for freebsd scripts/make_binary_distribution.sh: Make safe_mysqld a symlink to mysqld_safe in binary distribution. sql/item_func.cc: Cleaned up tmp_table_field() handling. sql/item_func.h: Cleaned up tmp_table_field() handling. sql/item_strfunc.h: Cleaned up tmp_table_field() handling. sql/item_timefunc.h: Cleaned up tmp_table_field() handling. sql/mysql_priv.h: Added nety_retry_count as a changeable variables sql/mysqld.cc: Added nety_retry_count as a changeable variables Allow one to specify a defaults file to be read when installing MySQL as a service. sql/net_pkg.cc: Added nety_retry_count as a changeable variables sql/net_serv.cc: Added nety_retry_count as a changeable variables sql/set_var.cc: Added nety_retry_count as a changeable variables sql/share/czech/errmsg.txt: Fixed wrong error message sql/share/danish/errmsg.txt: Fixed wrong error message sql/share/english/errmsg.txt: Fixed wrong error message sql/share/estonian/errmsg.txt: Fixed wrong error message sql/share/french/errmsg.txt: Fixed wrong error message sql/share/german/errmsg.txt: Fixed wrong error message sql/share/greek/errmsg.txt: Fixed wrong error message sql/share/hungarian/errmsg.txt: Fixed wrong error message sql/share/italian/errmsg.txt: Fixed wrong error message sql/share/japanese/errmsg.txt: Fixed wrong error message sql/share/korean/errmsg.txt: Fixed wrong error message sql/share/norwegian-ny/errmsg.txt: Fixed wrong error message sql/share/norwegian/errmsg.txt: Fixed wrong error message sql/share/polish/errmsg.txt: Fixed wrong error message sql/share/portuguese/errmsg.txt: Fixed wrong error message sql/share/romanian/errmsg.txt: Fixed wrong error message sql/share/russian/errmsg.txt: Fixed wrong error message sql/share/slovak/errmsg.txt: Fixed wrong error message sql/share/spanish/errmsg.txt: Fixed wrong error message sql/share/swedish/errmsg.txt: Fixed wrong error message sql/share/ukrainian/errmsg.txt: Fixed wrong error message sql/sql_class.cc: Indentaion cleanup sql/sql_class.h: Fixed wrong error message sql/sql_parse.cc: Fixed problem with CTRL-C when using mysqld --bootstrap sql/sql_select.cc: Ensure that select terminates if create_myisam_from_heap() fails. sql/sql_yacc.yy: Portability fix
* | merge with 3.23.52unknown2002-08-081-4/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged Docs/manual.texi: Auto merged include/my_pthread.h: Auto merged include/mysql_com.h: Auto merged include/mysql_version.h.in: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0sea.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/configure.in: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fil/fil0fil.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/dyn0dyn.ic: Auto merged innobase/include/ha0ha.ic: Auto merged innobase/include/sync0rw.ic: Auto merged innobase/include/univ.i: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/os/os0file.c: Auto merged innobase/os/os0thread.c: Auto merged innobase/page/page0cur.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/trx/trx0trx.c: Auto merged myisam/mi_create.c: Auto merged sql/ha_innodb.h: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_insert.cc: Auto merged strings/Makefile.am: Auto merged support-files/mysql.server.sh: Auto merged include/my_base.h: merge with 3.23.52 (use local file) include/sslopt-usage.h: merge with 3.23.52 (use local file) myisam/mi_search.c: merge with 3.23.52 (use local file) myisam/mi_write.c: merge with 3.23.52 (use local file) mysql-test/r/group_by.result: merge with 3.23.52 (Need to be fixed before push) mysys/my_pthread.c: merge with 3.23.52 (use local file) sql/gen_lex_hash.cc: merge with 3.23.52 (use local file) sql/ha_innodb.cc: Total hand-merge with 3.23.52 sql/sql_yacc.yy: merge with 3.23.52 (use local file) support-files/mysql.spec.sh: merge with 3.23.52 (use local file)