summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimemalff@lambda.hsd1.co.comcast.net.2007-10-185-3/+11
|\ | | | | | | into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
| * Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-10-105-3/+11
| |\ | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2007-10-081-1/+1
| | |\ | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| | | * Change URLs.cmiller@zippy.cornsilk.net2007-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Our web server has been restructured several times, and references to it in our source code has stayed the same. This patch from Paul DuBois updates all URLs to modern semantics.
| | | * Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167msvensson@pilot.mysql.com2007-10-034-3/+10
| | | |\ | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
| | | | * Merge ramayana.hindu.god:/home/tsmith/m/bk/50tsmith@ramayana.hindu.god2007-09-281-1/+1
| | | | |\ | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
| | | | * \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttnurnberg@sin.intern.azundris.com2007-09-154-2/+9
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/tnurnberg/15327/50-15327
| | * | | \ \ Merge bk-internal:/home/bk/mysql-5.1-maintmsvensson@pilot.mysql.com2007-10-031-1/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
| | | * \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167msvensson@pilot.mysql.com2007-10-031-1/+2
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
| | | | * \ \ \ \ Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167msvensson@pilot.mysql.com2007-10-031-1/+2
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167
| | | | | * | | | Bug#31167 Introduction of @@hostname breaks replication in a ringmsvensson@pilot.(none)2007-09-261-1/+2
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | - Use a local uservariable to avoid @@hostname in binlog
| | * | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-09-283-1/+8
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| | | * | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@sin.intern.azundris.com2007-09-153-1/+8
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| | | | * | | | Merge mysql.com:/home/tnurnberg/15327/50-15327tnurnberg@sin.intern.azundris.com2007-09-153-1/+8
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | | | | | | | | into mysql.com:/home/tnurnberg/15327/51-15327
| | | | | * | | Bug #15327: configure: --with-tcp-port option being partially ignoredtnurnberg@mysql.com/sin.intern.azundris.com2007-09-134-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make sure that if builder configured with a non-standard (!= 3306) default TCP port that value actually gets used throughout. if they didn't configure a value, assume "use a sensible default", which will be read from /etc/services or, failing that, from the factory default. That makes the order of preference - command-line option - my.cnf, where applicable - $MYSQL_TCP_PORT environment variable - /etc/services (unless configured --with-tcp-port) - default port (--with-tcp-port=... or factory default)
* | | | | | | | Fix for BUG#24923: Functions with ENUM issues.anozdrin/alik@station.2007-10-172-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the RETURNS column in the mysql.proc was of CHAR(64). That was not enough for storing long-named datatypes. The fix is to change CHAR(64) to LONGBLOB, and to throw warnings at the time a stored routine is created if some data is truncated during writing into mysql.proc.
* | | | | | | Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0jperkin@production.mysql.com2007-10-042-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/build/5.1
| * | | | | | | Restore creation of test databases and the anonymous user whichjperkin@production.mysql.com2007-10-042-0/+11
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | were accidentally removed during a previous rototill of this code. Fixes bug#27692. While it can be argued we should strive to provide a 'secure by default' installation, this happens to be the setup currently documented in the manual as the default, so defer changes that improve security out of the box to a co-ordinated effort later on. For now, make a note about the test databases and anonymous user in mysql_install_db and recommend that mysql_secure_installation be ran for users wishing to remove these defaults. [..re-commit of previously lost change..]
| * | | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-09-041-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
* | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-10-011-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/make-install/mysql-5.1-build
| * \ \ \ \ \ \ Merge trift2.:/MySQL/M51/clone-5.1joerg@trift2.2007-09-281-0/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 This is mysql-5.1.22-rc.
| | * | | | | | Preliminary fix forjoerg@trift2.2007-09-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #30759 mysql_install_db fails to set $extra_bindir properly in all cases.
| | * | | | | | scripts/mysqld_safe.shjoerg@trift2.2007-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy a fix by jperkin for bug#30624 into the 5.1.22 build tree.
* | | | | | | | make_binary_distribution.sh:kent@mysql.com/kent-amd64.(none)2007-10-011-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added special handling of "mysql_install_db" and "mysql.server" scripts, find executables relative to the current directory.
* | | | | | | | Makefile.am, make_binary_distribution.sh:kent@mysql.com/kent-amd64.(none)2007-09-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use custom 'pkgduppdir' mysql.server.sh: The server is installed in 'libexecdir'
* | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-09-262-240/+203
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/make-install/mysql-5.1-build
| * | | | | | | make_binary_distribution.sh:kent@mysql.com/kent-amd64.(none)2007-09-262-241/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'make install' to create the package Makefile.am: Added 'pkgsuppdir' to control location separately Pass on mandir and infodir Don't install headers
* | | | | | | | Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build-gca/mysql-5.1jperkin@production.mysql.com2007-09-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/trees/51/mysql-5.1
| * | | | | | | | Finish up last syslog -> want_syslog change missed in r1.91,jperkin@production.mysql.com2007-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing bug#30624
* | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-09-042-24/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50tsmith@ramayana.hindu.god2007-08-281-24/+8
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| | * | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50tsmith@ramayana.hindu.god2007-08-281-24/+8
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
| | | * | | | | | | Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003tsmith@ramayana.hindu.god2007-08-201-24/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the get_list_of_tables() routine. The symptom is that, when used with recent versions of DBD::mysql, mysqlhotcopy uses a double-qualified table name, for example: Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855. This is caused by a change in DBD::mysql. See this diff: http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188 Basically, older DBD::mysql implemented a limited ->table_info method; now the full method is implemented, and as a result DBI's ->tables() method has access to the schema value, so it uses it.
| * | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-Xtsmith@ramayana.hindu.god2007-08-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| | * | | | | | | | Merge trift2.:/MySQL/M51/netware3-5.1joerg@trift2.2007-08-271-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/target-5.1.22
| * | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-08-271-33/+67
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| * | | | | | | | | Bug#28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and ↵msvensson@pilot.(none)2007-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO_ZERO_DATE - Set sql_mode to default when creating system tables
| * | | | | | | | | Cset exclude: msvensson@pilot.(none)|ChangeSet|20070827092310|49459msvensson@pilot.(none)2007-08-271-2/+2
| | | | | | | | | |
| * | | | | | | | | Bug#30029 mysql_upgrade fails for 5.0 -> 5.1.21, 5.1.20 -> 5.1.21 upgradesmsvensson@pilot.(none)2007-08-271-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | - Change to use '' to quote a string inside another string
* | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-buildkent@kent-amd64.(none)2007-08-291-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
| * | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@kent-amd64.(none)2007-08-291-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
| | * | | | | | | mysql_config.sh:kent@mysql.com/kent-amd64.(none)2007-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flag changed name in icc 10
| * | | | | | | | make_win_src_distribution_old.sh:kent@mysql.com/kent-amd64.(none)2007-08-142-3/+11
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution_old.sh Makefile.am, make_win_src_distribution_old.sh: Rename and put in note not to be used
* | | | | | | | Merge trift2.:/MySQL/M51/netware3-5.1joerg@trift2.2007-08-271-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | | | More cleanup / fixing for NetWare:joerg@trift2.2007-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) "test_db.sql" is a plaintext file, no binary; 2) do not try to strip the binaries, it will not work.
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-08-141-33/+67
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-08-131-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map()
* | | | | | | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-061-1/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
| * | | | | | make_win_bin_dist:kent@mysql.com/kent-amd64.(none)2007-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected install path
| * | | | | | make_win_bin_dist:kent@mysql.com/kent-amd64.(none)2007-08-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy embedded .pdb and static debug lib