summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-022-1/+6
|\
| * Automerge from mysql-next-mr.Alexander Nozdrin2009-10-281-1/+1
| |\
| * \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-225-2/+155
| |\ \
| * | | bug#33731 - INSTALL/UNINSTALL PLUGIN: Inconsistent handling of identifier case Sergei Golubchik2009-10-122-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | indexed column in mysql.plugin table should use case-insensitive collation for index lookups to work (backport from 6.0) sql/sql_plugin.cc: generate the key correctly using key_copy. field->store() stores the value in record format, not key format.
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Postfix for WL#1349. Alexander Barkov2009-10-231-1/+1
| | |/ | |/| | | | | | | | | | | | | Don't do character set autodetection when running mysql from mysql_fix_privilege_tables.
* | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-235-2/+155
|\ \ \ | |/ /
| * | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+1
| |\ \
| | * | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+1
| | |/
| * | Automerge from mysql-trunk-merge.Alexander Nozdrin2009-10-193-1/+153
| |\ \
| | * \ Automerge from mysql-trunk.Alexander Nozdrin2009-10-193-1/+153
| | |\ \
| | | * \ Merge from mysql-5.4.3-beta-releaseTimothy Smith2009-10-163-1/+153
| | | |\ \
| | | | * | make_binary_distribution.sh: fix path for installing the MALLOC_LIB (to ↵unknown2009-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | $DEST/lib)
| | | | * | make_binary_distribution and mysql.spec: add options to copy a shared ↵unknown2009-09-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | library, for use by mysqld_safe, into pkglibdir during package creation
| | | | * | Add --malloc-lib=LIB option to mysqld_safe to LD_PRELOAD a shared library ↵unknown2009-09-232-1/+145
| | | | | | | | | | | | | | | | | | | | | | | | for mysqld
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-0/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | bug#41546: mysql-stress-run.pl is not packaged on WindowsJonathan Perkin2009-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Copy mysql-stress-run.pl into noinstall package.
* | | | | A backporting patch for WL#4300 (Define privileges for tablespaces).Alexander Nozdrin2009-10-103-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original revision in 6.0: ------------------------------------------------------------ revno: 2630.13.11 committer: Alexander Nozdrin <alik@mysql.com> branch nick: 6.0-rt-wl4300 timestamp: Thu 2008-07-24 11:44:21 +0400 message: A patch for WL#4300: Define privileges for tablespaces. ------------------------------------------------------------ per-file messages: mysql-test/r/grant.result Update result file: new columm 'Create_tablespace_priv' has been added to mysql.user. mysql-test/r/ps.result Update result file: new columm 'Create_tablespace_priv' has been added to mysql.user. mysql-test/r/system_mysql_db.result Update result file: new columm 'Create_tablespace_priv' has been added to mysql.user. mysql-test/suite/falcon/r/falcon_tablespace_priv.result Test case for WL#4300. mysql-test/suite/falcon/t/falcon_tablespace_priv.test Test case for WL#4300. mysql-test/suite/ndb/r/ndb_dd_ddl.result Test case for WL#4300. mysql-test/suite/ndb/t/ndb_dd_ddl.test Test case for WL#4300. scripts/mysql_system_tables.sql New columm 'Create_tablespace_priv' has been added to mysql.user. scripts/mysql_system_tables_data.sql 'CREATE TABLESPACE' is granted by default to the root user. scripts/mysql_system_tables_fix.sql Grant 'CREATE TABLESPACE' privilege during system table upgrade if a user had SUPER privilege. sql/sql_acl.cc Added CREATE TABLESPACE privilege. sql/sql_acl.h Added CREATE TABLESPACE privilege. sql/sql_parse.cc Check global 'CREATE TABLESPACE' privilege for the following SQL statements: - CREATE | ALTER | DROP TABLESPACE - CREATE | ALTER | DROP LOGFILE GROUP sql/sql_show.cc Added CREATE TABLESPACE privilege. sql/sql_yacc.yy Added CREATE TABLESPACE privilege.
* | | | | Bug #34197 CREATE PROCEDURE fails when COMMENT truncated in non Jon Olav Hauglid2009-10-092-1/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strict SQL mode The problem was that a COMMENT longer than 64 characters caused CREATE PROCEDURE to fail. This patch fixed the problem by changing the COMMENT field in mysql.proc from char(64) to text. The corresponding ROUTINE_COMMENT field in INFORMATION_SCHEMA.ROUTINES is also changed from varchar(64) to longtext. mysql_system_tables.sql and mysql_system_tables_fix.sql updated. Test case added to sp.test and affected result-files updated.
* | | | Backport of the patch Vladislav Vaintroub2009-09-301-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://lists.mysql.com/commits/57725 Vladislav Vaintroub 2008-11-03 Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from TARGET_LINK_LIBRARIES. Every exe or dll linked with mysys needs ws2_32, because mysys uses winsock function WSAStartup in my_init(). However, there is no need to explicitely add ws2_32 to the list of TARGET_LINK_LIBRARIES multiple times. Visual Studio comes with a handy pragma that tells linker to add library. So patch replaces bunch of ws2_32 in CMakeLists with single pragma comment(lib,"ws2_32") in my_init.c Additionally, reference to non-existing "debug" library has been removed from TARGET_LINK_LIBRARIES. The correct name of the library is "dbug".
* | | Merge from mysql-5.1.Alexander Nozdrin2009-09-231-0/+1
|\ \ \ | |/ /
| * | Install mysqld.libJonathan Perkin2009-09-041-0/+1
| | |
* | | Merge from mysql-5.1.Alexander Nozdrin2009-09-191-0/+17
|\ \ \ | |/ / | | / | |/ |/|
| * Only install the innodb plugin if the plugin directory exists.Jonathan Perkin2009-09-011-8/+14
| |
| * Install innodb_plugin on Windows.Jonathan Perkin2009-08-181-0/+11
| |
* | This is the 5.4 version of the fix for bug#47007Joerg Bruehe2009-09-083-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unresolved reference to 'innodb_system_libs' in "mysql_config" In 5.4.2, we use InnoDB 1.0.4 which does file IO via separate threads, opposed to the use of asynchronous IO previously. So there is no InnoDB call to "aio_read()" which was searched in "librt", causing a "-lrt" value of "innodb_system_libs", that whole variable is gone. This fix was applied in the build of 5.4.2-beta. scripts/Makefile.am: There is no "innodb_system_libs" variable any more, so it cannot be replaced by its value. scripts/mysql_config.pl.in: InnoDB does not need any platform-specific libraries any more, "innodb_system_libs" may go. scripts/mysql_config.sh: InnoDB does not need any platform-specific libraries any more, "innodb_system_libs" may go.
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-5/+54
|\ \ | |/ | | | | | | Changes to ha_innodb.cc are not propagated to plugin, they will come back via Oracle/Innobase if needed.
| * Merge the fix for bug#37808 into 5.1-build.Joerg Bruehe2009-07-211-5/+54
| |\
| | * Upmerge a bug fix from 5.0 to 5.1:Joerg Bruehe2009-07-211-5/+54
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | bug#37808 "make_binary_distribution" does not always generate correct names Successfully tested on 5.1 sources.
| | | * This is a fix for bug#37808Joerg Bruehe2009-06-261-5/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "make_binary_distribution" does not always generate correct names Originally, we solved deficiencies of the predefined "autoconf" macros (at least on OS X 10.5, they do not correctly differ between "x86" and "x86_64") by providing explicit "--platform" arguments. With this patch, "make_binary_distribution" evaluates CFLAGS, so it "just works" because CFLAGS contains information about the target CPU. This patch is accompanied by a change in our build tools that drops the setting of "--platform" arguments. scripts/make_binary_distribution.sh: This is a fix for bug#37808 "make_binary_distribution" does not always generate correct names Our platform names are the combination of operating system, architecture (CPU), and a possible suffix (typically "64bit", if a CPU is available in 32 bit too). We get these values from some predefined "autoconf" macros. However, these macros are not perfect, especially on OS X 10.5 they do not differ correctly between x86 (32 bit) and x86_64 (64 bit). Originally, we solved that by providing an explicit "--platform" argument, but it is better to get rid of that and ensure the script "just works". The best indication we have about the CPU is the "CFLAGS" value provided with "configure" and used in "make": It describes for which CPU the binaries are generated, not just which one was running the build. This approach should work even if we implement cross-compilation. So this patch evaluates CFLAGS and extracts its "-arch XYZ" part. When touching the file, I also replaced some tab characters by blanks.
* | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-049-54/+100
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | bzr branch mysql-5.1-performance-version mysql-trunk # Summit cd mysql-trunk bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin bzr rm innobase # remove the builtin Next step: build, test fixes.
| * | | automergeGeorgi Kodinov2009-06-191-1/+19
| |\ \ \ | | |/ / | |/| |
| | * | Bug #36654: mysqld_multi cannot start instances with different versions Georgi Kodinov2009-06-191-1/+19
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occasionally. mysql_multi can call mysqld_safe. In doing this it's not changing the current working directory. This may cause confusion in the case where mysqld_multi is handling instances of servers of different versions and the current working directory is the installation directory of one of these servers. Fixed by enhancing the meaning of basedir in [mysqldN] sections of mysqld_multi. If specified, mysqld_multi will change the current working directory to the basedir directory before starting the server in mysqld_multi ... start ... and then change it back to what it was. scripts/mysqld_multi.sh: Bug #36654: optionally preserve, change and restore the cwd when starting server instances
| * | Merge up 5.0-build into 5.1-build:Joerg Bruehe2009-05-295-5/+5
| |\ \ | | |/ | | | | | | | | | | | | mostly just the merge changesets, but also a change of Perl scripts to use "/usr/bin/perl" fixed.
| | * Use /usr/bin/perl as standard Perl install path (bug#44643)Kent Boortz2009-05-095-5/+5
| | |
| | * Merge main 5.0 into 5.0-buildJoerg Bruehe2009-05-082-35/+30
| | |\
| * | | Bug #44736 mysqld_safe's my_which() is broken and Staale Smedseng2009-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doesn't find 'logger' Due to a variable quoting mistake, the $PATH environment variable isn't parsed correctly when searching for the existence of the desired executable(s) (logger in this case). This patch removes the quotes.
| * | | merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-05-152-3/+8
| |\ \ \
| * | | | The arguments to use for ps on Mac OS X were mis-detected by the mysql_zapJim Winstead2009-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | utility. (Bug #41883, patch by Nicklas Westerlund)
| * | | | mysqld_safe could generate filenames with spaces and then didn't properlyJim Winstead2009-05-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | quote them in later use. (Bug #33685, based on a patch by Hartmut Holzgraefe)
| * | | | Add explanation of the possible -s values for mysqldumpslow. (Bug #35663,Jim Winstead2009-05-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | based on a contribution by Ask Bjørn Hansen)
| * | | | Add support for wildcards in mysql_convert_table_format, and addJim Winstead2009-04-281-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | short options for all of the long options. (Bug #30373, original contribution by Tobias Asplund)
| * | | | mysqld_multi still had mentions of safe_mysqld instead of mysqld_safe,Jim Winstead2009-04-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | as well as some unclear example paths. (Bug #28094)
| * | | | Update list of sorting options in mysqldumpslow (Bug #20454)Jim Winstead2009-04-281-2/+2
| | | | |
| * | | | Check for MEMORY, HEAP, and BLACKHOLE in mysql_convert_table_format whenJim Winstead2009-04-281-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preventing a change that would result in table data loss. (Bug #27149) Also updated mysql_convert_table_format to use --engine as the documentation claimed, and use the engine terminology throughout instead of the obsolete 'table type'.
* | | | | Merged in 5.1.35Mikael Ronstrom2009-07-011-6/+6
|\ \ \ \ \
| * | | | | Some portability fixes.MySQL Build Team2009-06-041-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/Makefile.am: use @PERL@ to call scripts/dheadgen.pl - don't rely on #! /usr/bin/perl scripts/dheadgen.pl: use 2-arg open() for compatibility with older Perl versions storage/innobase/srv/srv0srv.c: Don't use C++-style comments in C code
* | | | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-119-60/+95
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge main 5.1 into 5.1-buildJoerg Bruehe2009-05-082-35/+30
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 165 changesets with 23 conflicts: Text conflict in mysql-test/r/lock_multi.result Text conflict in mysql-test/t/lock_multi.test Text conflict in mysql-test/t/mysqldump.test Text conflict in sql/item_strfunc.cc Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/parse_file.cc Text conflict in sql/slave.cc Text conflict in sql/sp.cc Text conflict in sql/sp_head.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.cc Text conflict in sql/sql_crypt.cc Text conflict in sql/sql_db.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_parse.cc Text conflict in sql/sql_select.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_view.cc Text conflict in storage/innobase/handler/ha_innodb.cc Text conflict in storage/myisam/mi_packrec.c Text conflict in tests/mysql_client_test.c Updates to Innobase, taken from main 5.1: bzr: ERROR: Some change isn't sane: File mysql-test/r/innodb-semi-consistent.result is owned by Innobase and should not be updated. File mysql-test/t/innodb-semi-consistent.test is owned by Innobase and should not be updated. File storage/innobase/handler/ha_innodb.cc is owned by Innobase and should not be updated. File storage/innobase/ibuf/ibuf0ibuf.c is owned by Innobase and should not be updated. File storage/innobase/include/row0mysql.h is owned by Innobase and should not be updated. File storage/innobase/include/srv0srv.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.h is owned by Innobase and should not be updated. File storage/innobase/include/trx0trx.ic is owned by Innobase and should not be updated. File storage/innobase/lock/lock0lock.c is owned by Innobase and should not be updated. File storage/innobase/page/page0cur.c is owned by Innobase and should not be updated. File storage/innobase/row/row0mysql.c is owned by Innobase and should not be updated. File storage/innobase/row/row0sel.c is owned by Innobase and should not be updated. File storage/innobase/srv/srv0srv.c is owned by Innobase and should not be updated. File storage/innobase/trx/trx0trx.c is owned by Innobase and should not be updated. (Set env var 'ALLOW_UPDATE_INNOBASE_OWNED' to override.)
View Lorry Controller Status