summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Handle different installation layouts.Vladislav Vaintroub2010-01-242-42/+41
| | | | | | | | | | | | | | | | | using cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in tar.gz or zip packages. INSTALL_LAYOUT=UNIX will produce unixish install layout (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages. Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set. There are numerous other variables that allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc). This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX. There are 2 special options that expect full directory paths - MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent is --localstatedir) - SYSCONFDIR can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
* Fix some problems found by kent. Vladislav Vaintroub2010-01-181-0/+4
| | | | | | -lm is sometimes not linked, which causes errors about undefined rint() - FreeBSD embedded library does not link with the flags returned by mysql_config (added -lcrypt to LIBS, whereby causing overlinking in case of normal non-embedded client)
* port some mysql_binary_distribution hacks to cmakeVladislav Vaintroub2010-01-151-3/+24
|
* mergeVladislav Vaintroub2010-01-141-0/+359
|\
| * WL#2360 Performance schemaMarc Alff2010-01-111-0/+359
| | | | | | | | | | Part V: performance schema implementation
* | fix syntax error in INSTALL cmake commandVladislav Vaintroub2010-01-141-1/+1
| |
* | Remove support for "make install" DESTDIR - did not work as expectedVladislav Vaintroub2010-01-143-257/+234
| |
* | Fix CFLAGS passed to mysql_config, in case makefile generator is Makefile basedVladislav Vaintroub2010-01-141-2/+10
| |
* | mergeVladislav Vaintroub2009-12-221-0/+19
|\ \ | |/
| * Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-221-0/+30
| |\ | | | | | | | | | | | | Conflicts: - storage/ibmdb2i/ha_ibmdb2i.cc
| * \ Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-161-0/+19
| |\ \
| | * \ Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-161-0/+19
| | |\ \
| | | * | Handle the "semisync" plugin inMySQL Build Team2009-11-261-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - binary distributions for Windows, - "generic" RPM packages.
* | | | | mergeVladislav Vaintroub2009-12-191-0/+30
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+30
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - include/my_no_pthread.h - mysql-test/r/sp-ucs2.result - sql/log.cc - sql/sql_acl.cc - sql/sql_yacc.yy
| | * | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-15/+0
| | |\ \ \ | | | |/ /
| | * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-0/+30
| | |\ \ \
| | | * | | This is a patch for bug#41569.unknown2009-12-031-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "mysql_upgrade (ver 5.1) add 3 fields to mysql.proc table but does not set values". mysql_upgrade (ver 5.1) adds 3 fields (character_set_client, collation_connection and db_collation) to the mysql.proc table, but does not set any values. When we run stored procedures, which were created with mysql 5.0, a warning is logged into the error log. The solution to this is for mysql_upgrade to set default best guess values for these fields. A warning is also written during upgrade, to make the user aware that default values are set. client/mysql_upgrade.c: Result lines which start with "WARNING" are passed through to the output. This way we have a way of triggering WARNING-messages during upgrade directly from the .sql-script. mysql-test/r/mysql_upgrade.result: Expected result of the test. mysql-test/t/mysql_upgrade.test: Added a test-case for the bug. scripts/mysql_system_tables_fix.sql: The new fields are populated, and warnings are written.
* | | | | | mergeVladislav Vaintroub2009-12-164-100/+144
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-15/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-15/+0
| | |/ / /
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-85/+144
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - extra/comp_err.c - mysql-test/collections/default.experimental - mysql-test/r/archive.result - mysql-test/r/select.result - mysql-test/suite/binlog/r/binlog_unsafe.result - mysql-test/suite/binlog/t/binlog_unsafe.test - mysql-test/suite/rpl/t/disabled.def - mysql-test/t/archive.test - mysql-test/t/select.test - sql/item.cc - sql/item.h - sql/item_timefunc.cc - sql/sql_base.cc - sql/sql_delete.cc - sql/sql_load.cc - sql/sql_partition.cc - sql/sql_table.cc - storage/innobase/handler/ha_innodb.cc - vio/vio.c
| | * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-116-9/+29
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - client/mysqltest.cc - mysql-test/collections/default.experimental - mysql-test/suite/rpl/t/disabled.def - sql/mysqld.cc - sql/opt_range.cc - sql/sp.cc - sql/sql_acl.cc - sql/sql_partition.cc - sql/sql_table.cc
| | * | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-1/+1
| | |\ \ \ | | | | |/ | | | |/|
| | | * | MergeKent Boortz2009-11-171-1/+1
| | | |\ \
| | | | * | Include the "mysql-test/collections" directory when creating windows ZIP archiveKent Boortz2009-11-171-1/+1
| | | | | |
| | * | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-242-84/+143
| | |\ \ \ \ | | | |/ / /
| | | * | | auto-mergeTimothy Smith2009-11-042-84/+143
| | | |\ \ \ | | | | |/ /
| | | | * | Add a few comments to clarify do_query() return values in ↵Timothy Smith2009-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | mysql_secure_installation.pl
| | | | * | Bug#48031: mysql_secure_installation -- bash bug regarding passwords withTimothy Smith2009-11-032-6/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | special chars This script failed when the user tried passwords with multiple spaces, \, # or ' characters. Now proper escaping and quoting is used in all contexts. This problem occurs in the Perl version of this script, too, so fix it in both places.
| | | | * | Bug#48086: mysql_secure_installation does NOT work on SolarisTimothy Smith2009-11-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a bash-ism (if ! ...).
| | | | * | Bug#35106: mysql_secure_installation fails on Windows, missing "useTimothy Smith2009-10-301-77/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Term::ReadKey" Add the missing module import. Also, while here, fix a few glaring problems with the script, and ensure that it behaves properly. It seems this script may have never been working correctly (e.g., reading password didn't chomp() the result, so password was set with \n at the end; comparing the re-typed password to original was done with inverted test). Add END { cleanup(); } block to ensure the script removes temporary working files. Add SIG{INT} / SIG{QUIT} handler. Do a bit of reorganization to make the code easier to understand. Limit failed connection attempts to 3. Use ./bin/mysql if it exists, and then fall back on mysql in PATH (before it assumed 'mysql' in the path). Print a nicer error if 'mysql' can't be called. This has been tested on Windows (ActivePerl from cmd.exe, no cygwin needed) and Linux.
* | | | | | mergeVladislav Vaintroub2009-12-112-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-031-0/+1
| |\ \ \ \ \
| * \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-022-4/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - sql/sql_yacc.yy
| * | | | | | | bug#36462: mysql_install_db fails when run as user root andJonathan Perkin2009-11-231-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root-directory not writable Rather than use the -w test, attempt the chown and bail out if it fails.
| * | | | | | | Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same ↵Guilhem Bichot2009-11-181-1/+7
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as dash on server options" from 6.0 (revision-id:guilhem@mysql.com-20090505113602-l12kxupeatve18dh). Such bug led "mysqld_safe --core_file_size=#" to not work because mysqld_safe wouldn't recognize that "ulimit -c" is needed; only --core-file-size=# worked. Same for --open_files_limit and other options with _ where mysqld_safe needs to do something more than passing to mysqld. Original fix by Erik Ljungstrom erik at ibiblio dot org ; slightly modified here. Tested on all internally accessible Unix.
* | | | | | | simplify some tests, silence warning in script installVladislav Vaintroub2009-12-071-0/+9
| | | | | | |
* | | | | | | fix cmake warning about included scripts setting their minimum required versionVladislav Vaintroub2009-12-071-2/+0
| | | | | | |
* | | | | | | Deal with empty elements in LIB_DEPENDS list (in some older 2.6 versionVladislav Vaintroub2009-12-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | empty element produces a warning)
* | | | | | | fix small stuff in mysql_configVladislav Vaintroub2009-12-071-7/+32
| | | | | | |
* | | | | | | mergeVladislav Vaintroub2009-12-041-0/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-022-4/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-251-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following 6.0 revisions were analyzed: - sp1r-brian@zim.(none)-20071228102738-21894 - sp1r-brian@zim.(none)-20071228121841-56447 - sp1r-brian@zim.(none)-20071228205403-56423 - sp1r-brian@zim.(none)-20071228221139-55341 - sp1r-brian@zim.(none)-20071228233443-55352 - sp1r-brian@zim.(none)-20071229094527-61763 - sp1r-brian@zim.(none)-20071230203739-61746 - sp1r-brian@zim.(none)-20080102213805-61741 - sp1r-brian@zim.(none)-20080103201041-61746 - sp1r-brian@zim.(none)-20080104234927-59875 - sp1r-brian@zim.(none)-20080105005827-59874 - sp1r-brian@zim.(none)-20080105012020-59865 - sp1r-brian@zim.(none)-20080106003858-59857 - sp1r-brian@zim.(none)-20080123195552-31680 - sp1r-brian@zim.(none)-20080124201848-29999 - sp1r-brian@zim.(none)-20080129075144-36991 - sp1r-cbell/Chuck@mysql_cab_desk.-20080215041806-21954 - sp1r-vvaintroub@wva.-20080212124547-06272 - sp1r-dfischer/mysqldev@mysql.com/production.mysql.com-20071223184258-15140 - sp1r-brian@zim.(none)-20080206122216-35774 - sp1r-baker@bk-internal.mysql.com-20080209005622-35947 - sp1r-baker@bk-internal.mysql.com-20080224215608-24613 - sp1r-baker@bk-internal.mysql.com-20080307170710-63543 - sp1r-baker@bk-internal.mysql.com-20080312233205-13069 - sp1r-Reggie@core.-20080402175211-28643 - kpettersson@mysql.com-20080901101150-4ne74r8v0492vv42 - alik@sun.com-20090805173811-9fzt0ymcp9tsvn7k - alik@sun.com-20090805173937-fcv1fdveodq5x9gb - alik@sun.com-20090805175009-g1od16i3t1xkw2qr - kostja@sun.com-20090805200643-j9i4fy7ii8ijho5c - alik@sun.com-20090807195303-j4fb5m4l1dgdahwo - alik@sun.com-20090808114848-3rkzr9kifrijzaqy - alik@sun.com-20090810041739-ugmx34h34uid8mox - alik@sun.com-20090810105306-rf43rfyzzblsy5e7 - alik@sun.com-20090810123113-ccdjwai68b5woqdm - alik@sun.com-20090811080423-gb7pibec1znaydzy - alik@sun.com-20090811082130-5uckar1vx3kdsw7g - alik@sun.com-20090812202051-uqkfwwxxcjvo5ean The following bugfixes are also backported within this patch: - Bug#34292: netdb.h missing in hostname.cc - Bug#39153: Failing to lookup a host name can lead to crash in current IPv6 implementation - Bug#38247: Server does not resolve connecting ip's - Bug#43006: main.skip_name_resolve fails on Windows in PB2 - Bug#45606: ACL requires IPv4-mapped addresses to be used - Bug#45584: Host name cache does not work as a cache
* | | | | | mergeVladislav Vaintroub2009-12-022-4/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Manual resolving for the following filesAndrei Elkin2009-12-012-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Text conflict in mysql-test/collections/default.experimental Text conflict in mysql-test/r/show_check.result Text conflict in mysql-test/r/sp-code.result Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result Text conflict in mysql-test/suite/rpl/t/disabled.def Text conflict in mysql-test/t/show_check.test Text conflict in mysys/my_delete.c Text conflict in sql/item.h Text conflict in sql/item_cmpfunc.h Text conflict in sql/log.cc Text conflict in sql/mysqld.cc Text conflict in sql/repl_failsafe.cc Text conflict in sql/slave.cc Text conflict in sql/sql_parse.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_yacc.yy Text conflict in storage/myisam/ha_myisam.cc Corrected results for stm_auto_increment_bug33029.reject 2009-12-01 20:01:49.000000000 +0300 <andrei> @@ -42,9 +42,6 @@ <andrei> RETURN i; <andrei> END// <andrei> CALL p1(); <andrei> -Warnings: <andrei> -Note 1592 Statement may not be safe to log in statement format. <andrei> -Note 1592 Statement may not be safe to log in statement format. There should be indeed no Note present because there is in fact autoincrement top-level query in sp() that triggers inserting in yet another auto-inc table. (todo: alert DaoGang to improve the test).
| | * | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == ↵Andrei Elkin2009-11-302-1/+5
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | build@mysql.com-20091104182209-iui387z35159aoyw
| | * | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-132-4/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CONFLICTS ========= Text conflict in sql/sql_yacc.yy 1 conflicts encountered.
| | | * | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: Backport of: bzr log -r revid:sp1r-serg@sergbook.mysql.com-20070505200319-38337 ------------------------------------------------------------ revno: 2469.263.4 committer: serg@sergbook.mysql.com timestamp: Sat 2007-05-05 13:03:19 -0700 message: Removing deprecated features: --master-XXX command-line options log_bin_trust_routine_creators table_type BACKUP TABLE ... RESTORE TABLE ... SHOW PLUGIN LOAD TABLE ... FROM MASTER LOAD DATA FROM MASTER SHOW INNODB STATUS SHOW MUTEX STATUS SHOW TABLE TYPES ... TIMESTAMP(N) ... TYPE=engine RESET SLAVE don't reset connection parameters anymore LOAD DATA: check opt_secure_file_priv before access(filename) improved WARN_DEPRECATED macro
* | | | | | | Fix "command install() is not scriptable" cmake errorVladislav Vaintroub2009-12-021-4/+15
| | | | | | |
View Lorry Controller Status