summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge the fix for bug#37623 (Suffix "-64bit" is duplicated)Joerg Bruehe2008-06-271-0/+1
|\ | | | | | | | | from 5.0 into the 5.1.26 release clone.
| * OS X 10.5 is now a supported platform,Joerg Bruehe2008-06-271-0/+1
| | | | | | | | so Apple's internal name ("darwin9") must be translated to ours ("osx10.5").
* | Bug #37024: Wrong location of messagefilesTimothy Smith2008-06-171-214/+239
| | | | | | | | | | | | | | | | | | | | | | | | make_binary_distribution.sh got clobbered by the 5.0 version during a merge. This caused a few packaging problems, including message files put in the wrong place and some missing files. Fix is just to revert back to the 5.1 version from before the merge. Problem introduced in ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none) This change was made in the 5.1.25 release clone in BK, but never made it to the main mysql-5.1 BK tree. I am adding it to mysql-5.1 bzr.
* | Merge mysql.com:/home/kent/bk/mysql-5.0-release-mergeunknown2008-05-131-239/+214
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1 BUILD/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/std_data/funcs_1/innodb_tb1.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb2.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb3.txt: Auto merged mysql-test/std_data/funcs_1/innodb_tb4.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb1.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb2.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb3.txt: Auto merged mysql-test/std_data/funcs_1/memory_tb4.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb1.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb2.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb3.txt: Auto merged mysql-test/std_data/funcs_1/myisam_tb4.txt: Auto merged mysql-test/std_data/funcs_1/t3.txt: Auto merged mysql-test/std_data/funcs_1/t4.txt: Auto merged mysql-test/std_data/funcs_1/t7.txt: Auto merged mysql-test/std_data/funcs_1/t9.txt: Auto merged mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc: Auto merged mysql-test/suite/funcs_1/datadict/datadict_load.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/innodb_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/memory_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb1.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb2.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb3.inc: Auto merged mysql-test/suite/funcs_1/include/myisam_tb4.inc: Auto merged mysql-test/suite/funcs_1/include/sp_tb.inc: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/innodb_trig_frkey.result: Auto merged mysql-test/suite/funcs_1/r/innodb_views.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_innodb.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_memory.result: Auto merged mysql-test/suite/funcs_1/r/is_columns_myisam.result: Auto merged mysql-test/suite/funcs_1/r/is_tables_ndb.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/memory_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/r/memory_views.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_02.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_06.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_07.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_storedproc_10.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0102.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_03.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_0407.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_08.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_09.result: Auto merged mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result: Auto merged mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_02.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_03.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_06.inc: Auto merged mysql-test/suite/funcs_1/storedproc/storedproc_10.inc: Auto merged mysql-test/suite/funcs_1/t/innodb_trig_0407.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/memory_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_02.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_03.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_06.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_07.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_08.test: Auto merged mysql-test/suite/funcs_1/t/myisam_storedproc_10.test: Auto merged mysql-test/suite/funcs_1/triggers/trig_frkey2.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0102.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_03.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_0407.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_08.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_09.inc: Auto merged mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc: Auto merged mysql-test/suite/funcs_1/views/func_view.inc: Auto merged mysql-test/suite/funcs_1/views/views_master.inc: Auto merged
| * make_binary_distribution.sh:unknown2008-04-281-9/+3
| | | | | | | | | | | | | | | | Copy all of the "std_data" directory scripts/make_binary_distribution.sh: Copy all of the "std_data" directory
| * Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50unknown2008-03-191-2/+2
| |\ | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50
| | * Bug #25486: mysqld_multi.server.sh missing from buildsunknown2008-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mysqld_multi.server executable, and allow it to be installed via chkconfig on LSB-compliant systems. scripts/make_binary_distribution.sh: Adjust permissions on some support-files/* scripts: make mysqld_multi.server executable, and mysql-VERSION.spec not executable. support-files/mysqld_multi.server.sh: Add LSB comments for chkconfig to simplify installation for sysadmins.
| * | Merge trift2.:/MySQL/M50/clone-5.0unknown2008-03-142-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 scripts/make_win_bin_dist: Auto merged
| | * | Include "mysql_upgrade_shell.pl" in a binary distribution on Windows.unknown2008-03-051-0/+1
| | | |
| | * | scripts/CMakeLists.txt : Treat "mysql_upgrade_shell" the same way as all ↵unknown2008-03-041-0/+3
| | |/ | | | | | | | | | | | | | | | | | | the other scripts. scripts/CMakeLists.txt: Treat "mysql_upgrade_shell" the same way as all the other scripts.
| * | Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-03-141-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 client/mysqldump.c: Auto merged
| | * \ Merge kaamos.(none):/data/src/mysql-5.0unknown2008-03-121-1/+3
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kaamos.(none):/data/src/opt/mysql-5.0-opt client/mysql.cc: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/view.result: Manual merge. mysql-test/t/view.test: Manual merge. scripts/mysql_config.sh: Manual merge.
* | | | Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from ↵unknown2008-04-041-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.1.23 to 5.1.24 The problem is that when upgrading the event table, the sql_mode column was always being added instead of being updated to list new sql_mode values, causing upgrades of the event which already have a sql_mode column to not be updated to the new sql_mode values. The solution is to always add first a stub sql_mode column and subsequently update the column to the new sql_mode values. scripts/mysql_system_tables_fix.sql: Always add and update the sql_mode column of the event table.
* | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-141-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 client/mysqldump.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged scripts/mysql_config.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/unireg.h: Auto merged
| * \ \ \ Merge kaamos.(none):/data/src/mysql-5.1unknown2008-03-121-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kaamos.(none):/data/src/opt/mysql-5.1-opt client/mysql.cc: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged include/my_global.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/disabled.def: Auto merged sql/filesort.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_plugin.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/func_time.result: Manual merge. mysql-test/r/view.result: Manual merge. mysql-test/t/view.test: Manual merge. scripts/mysql_config.sh: Manual merge. sql-common/client.c: Manual merge. sql/sql_parse.cc: Manual merge.
| | * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2008-03-101-1/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/misc/mysql/29645/51-29645
| | | * \ \ \ Merge mysql.com:/misc/mysql/29645/50-29645unknown2008-03-101-1/+3
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/misc/mysql/29645/51-29645 scripts/mysql_config.sh: Auto merged
| | | | * | | Bug#29645: Link failure when using the embedded serverunknown2008-02-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_config --cflags gave a flag that forced the HP/UX C++ compiler into C-mode; as a result, C++ sources could not be compiled correctly. We now filter out the offending flag (like we do for Sun) so that --cflags will work for both C and C++. scripts/mysql_config.sh: Add -AC99 (for HP/UX) to the list of flags we need to remove from "mysql_config --cflags" so they work for C and C++ both.
* | | | | | | Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildunknown2008-03-111-13/+27
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/build/mysql-5.1-build
| * | | | | | make_win_bin_dist:unknown2008-03-111-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include .pdb files for tools and libraries (bug#35104) scripts/make_win_bin_dist: Include .pdb files for tools and libraries (bug#35104)
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-071-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into amd64.(none):/src/bug27101/my51-bug27101
| * \ \ \ \ \ \ Merge amd64.(none):/src/bug27101/my50-bug27101unknown2008-03-071-4/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | into amd64.(none):/src/bug27101/my51-bug27101
| | * | | | | Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parametersunknown2008-03-071-4/+5
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure mysqlhotcopy doesn't create unrestorable slaves. scripts/mysqlhotcopy.sh: Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters - Record what's been executed by the slave, not what's been delivered.
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-063-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1 libmysqld/Makefile.am: Auto merged scripts/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_config.sh: Auto merged sql/Makefile.am: Auto merged sql/mysqld.cc: Auto merged sql/unireg.h: Auto merged
| * | | | | Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/bug-31736-5.1unknown2008-01-083-0/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1 scripts/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged
| | * | | | | Use pkglibdir to simplify pkgplugindir, and fix the path in aunknown2008-01-022-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | couple of Makefiles. Continuation of the fix for bug#31736. libmysqld/Makefile.am: Use pkglibdir plugin/daemon_example/Makefile.am: Use pkglibdir plugin/fulltext/Makefile.am: Use pkglibdir scripts/Makefile.am: Use pkglibdir scripts/make_binary_distribution.sh: Update comment sql/Makefile.am: Use pkglibdir storage/archive/Makefile.am: Use pkglibdir storage/blackhole/Makefile.am: Use pkglibdir storage/example/Makefile.am: Use pkglibdir, fix pkgplugindir storage/federated/Makefile.am: Use pkglibdir storage/innobase/Makefile.am: Use pkglibdir, fix pkgplugindir
| | * | | | | Add new pkgplugindir handling to seperate plugins from libraries,unknown2007-12-193-0/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and allow override for binary distributions. Extend mysql_config to print compiled-in plugin location for third-party plugins to use. Resolves bug#31736. libmysqld/Makefile.am: Use pkgplugindir. plugin/daemon_example/Makefile.am: Use pkgplugindir. plugin/fulltext/Makefile.am: Use pkgplugindir. scripts/Makefile.am: Add pkgplugindir. scripts/make_binary_distribution.sh: Add pkgplugindir. scripts/mysql_config.sh: Add pkgplugindir. sql/Makefile.am: Use pkgplugindir. sql/mysqld.cc: Use PLUGINDIR, derived from pkgplugindir, instead of LIBDIR for plugins. sql/unireg.h: Use PLUGINDIR instead of LIBDIR, and define to be the default setting of pkgplugindir. storage/innobase/Makefile.am: Use pkgplugindir. storage/archive/Makefile.am: Use pkgplugindir. storage/blackhole/Makefile.am: Use pkgplugindir. storage/example/Makefile.am: Use pkgplugindir. storage/federated/Makefile.am: Use pkgplugindir.
* | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-02-221-75/+24
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51
| * | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50unknown2008-02-221-75/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50 scripts/mysqlhotcopy.sh: Auto merged
| | * | | | | Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics nameunknown2008-02-181-75/+24
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove code from mysqlhotcopy which deals with the so-called "RAID" feature of older MyISAM. scripts/mysqlhotcopy.sh: Remove code which tried to handle the so-called "RAID" files. The "RAID" feature has been dropped from MySQL builds, and this code caused mysqlhotcopy to skip (silently) over databases with two-character names (e.g., "ab").
* | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-02-181-0/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51 scripts/mysql_config.sh: Auto merged support-files/mysql.spec.sh: Manual merge
| * | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50unknown2008-02-181-0/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50
| | * | | | | Bug #21158 mysql_config doesn't include -lmygccunknown2008-02-141-0/+11
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs. Required when linking against our static libs, if yassl is used, and gcc used to build library is significantly different from that which is using the library. scripts/mysql_config.sh: Add -lmygcc to --libs, --libs_r, and --embedded-libs output, if libmygcc.a is found in the pkglibdir. This works around a problem when linking against the static client libs which were built with a different GCC than the current compiler. In this case, without -lmygcc, several builtin functions (e.g., __pure_virtual, __builtin_delete) are left undefined. Currently it is yassl which pulls in these symbols. This isn't a problem when linking against shared libraries, or when using the same compiler version. Currently it shows up with libs built on build.mysql.com with gcc 2.95.3, when using them on more recent systems. Also strip the -mcpu, -mtune, and -march cflags. The calling package can determine what optimization parameters to choose.
| * | | | | Strip comments from queries before explaining them. Fixes BUG#34339unknown2008-02-061-3/+4
| | | | | |
* | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-02-132-4/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged extra/resolveip.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/t/disabled.def: Take both new entries into "disabled.def".
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-02-082-4/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dipika.(none):/opt/local/work/mysql-5.1-runtime include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/suite/binlog/r/binlog_row_binlog.result: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_acl.cc: Auto merged sql-common/client.c: Auto merged sql/sql_parse.cc: Auto merged sql/sql_view.cc: Auto merged
| | * | | | | Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitutionunknown2008-02-072-4/+8
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that one can not create a stored routine if sql_mode contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when a event is created, the mode is silently lost if sql_mode contains one of the aforementioned. This was happening because the table definitions which stored sql_mode values weren't being updated to accept new values of sql_mode. The solution is to update, in a backwards compatible manner, the various table definitions (columns) that store the sql_mode value to take into account the new possible values. One incompatible change is that if a event that is being created can't be stored to the mysql.event table, an error will be raised. The tests case also ensure that new SQL modes will be added to the mysql.proc and mysql.event tables, otherwise the tests will fail. mysql-test/r/events_bugs.result: Add test case result for Bug#32633 mysql-test/r/information_schema.result: Update the sql_mode column definition. mysql-test/r/sp.result: Add test case result for Bug#32633 mysql-test/r/system_mysql_db.result: Update the sql_mode column definition. mysql-test/t/events_bugs.test: Add test case for Bug#32633 mysql-test/t/sp.test: Add test case for Bug#32633 mysql-test/t/system_mysql_db_fix50117.test: Update the sql_mode column definition. scripts/mysql_system_tables.sql: Update the sql_mode column definition. scripts/mysql_system_tables_fix.sql: Update the sql_mode column definition. sql/event_db_repository.cc: Reset and restore SQL modes when storing and loading a event from the data dictionary. Also throw out a error if a store fails. sql/mysqld.cc: Add warning to avoid this problem in the future. sql-common/my_user.c: Truncate length if user name or host name does not fit in the buffer. sql/sp.cc: SQL mode of the thread must not effect data dictionary operations.
* | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2008-02-051-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51 scripts/make_binary_distribution.sh: Auto merged
| * | | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-01-311-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge client/client_priv.h: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/suite/rpl/t/rpl_err_ignoredtable.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_view.cc: Auto merged mysql-test/suite/rpl/r/rpl_invoked_features.result: Manual merge. mysql-test/suite/rpl/t/rpl_invoked_features.test: Manual merge. sql/log.cc: Manual merge.
| | * | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2007-12-191-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge mysql-test/include/have_multi_ndb.inc: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: Auto merged mysql-test/suite/rpl_ndb/t/disabled.def: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/log.cc: Auto merged sql/log_event_old.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/rpl_rli.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_binlog.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_string.cc: Auto merged mysql-test/Makefile.am: SCCS merged mysql-test/mysql-test-run.pl: Manual merge. mysql-test/suite/binlog/t/disabled.def: Manual merge. mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result: Manual merge. mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result: Manual merge. sql/log_event.cc: Manual merge. ,
| | | * \ \ \ Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-mergeunknown2007-11-281-0/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/mysqlbinlog.result: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged sql/log_event.cc: Auto merged mysql-test/mysql-test-run.pl: Manual merge mysql-test/lib/mtr_cases.pl: Manual merge, using remote code.
| | | | * | | | Add mysql-test/lib/*.sql to dists*unknown2007-11-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/Makefile.am: Add mysql-test/include/*.sql to dist scripts/make_binary_distribution.sh: Add mysql-test/include/*.sql to bindist
* | | | | | | | Makefile.am, CMakeLists.txt, make_win_bin_dist:unknown2008-01-313-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed references to deleted "mysql_explain_log" and "mysql_tableinfo" scripts/CMakeLists.txt: Removed references to deleted "mysql_explain_log" and "mysql_tableinfo" scripts/Makefile.am: Removed references to deleted "mysql_explain_log" and "mysql_tableinfo" scripts/make_win_bin_dist: Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
* | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/done/b32679/51unknown2008-01-232-4/+14
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51 scripts/make_binary_distribution.sh: Auto merged
| * | | | | | | Bug #32679: mysqld_safe looks for errmsg.sys in wrong pathunknown2007-12-032-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for bug 28544 moved our package data from ./share/mysql to ./share. mysqld_safe had the old directory hard-coded. The fix is to use the @pkgdatadir@ and @prefix@ values, to adapt to different ways of building the package. scripts/make_binary_distribution.sh: Document that our build system explicitly overrides the @pkgfoo@ (e.g., pkgdatadir, pkglibdir, etc.) variables when 'make' is called. scripts/mysqld_safe.sh: Replace hard-coded "./share/mysql" with something like echo @pkgdatadir@ | sed -e s/^@prefix@//. Since the fix for bug 28544, this has been broken for mysql 5.1+, where the package data dir is "./share" instead of "./share/mysql".
* | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2008-01-024-3/+356
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build scripts/CMakeLists.txt: Auto merged scripts/Makefile.am: Auto merged scripts/make_win_bin_dist: Auto merged
| * | | | | | | Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:unknown2007-12-284-3/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Perl version of script "mysql_secure_installation" make_win_bin_dist: Corrected copy of SQL files to "share" directory scripts/mysql_secure_installation.pl.in: Added Perl version of script "mysql_secure_installation" scripts/CMakeLists.txt: Added Perl version of script "mysql_secure_installation" scripts/Makefile.am: Added Perl version of script "mysql_secure_installation" scripts/make_win_bin_dist: Corrected copy of SQL files to "share" directory
| * | | | | | | Merge trift2.:/MySQL/M50/bug33536-5.0unknown2007-12-281-4/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
* | \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/bug33536-5.1unknown2007-12-281-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | | | | | | scripts/make_binary_distribution.shunknown2007-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After-merge fix for bug#33536: The target to copy to is now called "$DEST". scripts/make_binary_distribution.sh: After-merge fix for bug#33536: The target to copy to is now called "$DEST".