tsmith@ramayana.hindu.god
732eb0b4ce
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
958f615f36
Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-18 12:04:22 -07:00
tsmith@ramayana.hindu.god
845b94451f
Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics name
...
Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.
2008-02-18 11:48:33 -07:00
tsmith@ramayana.hindu.god
cd6e2ad99f
Bug #21158 mysql_config doesn't include -lmygcc
...
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.
2008-02-14 01:05:25 -07:00
joerg@trift2.
341258dba4
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
davi@mysql.com/endora.local
1c6768c487
Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
...
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.
2008-02-07 08:47:39 -02:00
mtaylor@solace.(none)
9a2090fcdd
Strip comments from queries before explaining them. Fixes BUG#34339
2008-02-06 04:33:27 +01:00
tsmith@ramayana.hindu.god
c99d06a5f3
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:15:07 -07:00
kent@mysql.com/kent-amd64.(none)
ae9a5a2fea
Makefile.am, CMakeLists.txt, make_win_bin_dist:
...
Removed references to deleted "mysql_explain_log" and "mysql_tableinfo"
2008-01-31 20:55:58 +01:00
mkindahl@dl145h.mysql.com
4c95b29614
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 17:46:50 +01:00
tsmith@ramayana.hindu.god
e75e8d6321
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/done/b32679/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-01-23 16:59:44 -07:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
cb00c20749
Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/bug-31736-5.1
...
into chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/bug-31736/5.1
2008-01-08 14:04:03 +00:00
df@pippilotta.erinye.com
5c028eb402
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2008-01-02 22:26:41 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
e286ac998c
Use pkglibdir to simplify pkgplugindir, and fix the path in a
...
couple of Makefiles. Continuation of the fix for bug#31736.
2008-01-02 13:00:46 +00:00
kent@mysql.com/kent-amd64.(none)
e45e7d9e2e
Makefile.am, CMakeLists.txt, mysql_secure_installation.pl.in:
...
Added Perl version of script "mysql_secure_installation"
make_win_bin_dist:
Corrected copy of SQL files to "share" directory
2007-12-28 22:58:54 +01:00
joerg@trift2.
98e5fc1211
Merge trift2.:/MySQL/M51/bug33536-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-28 16:28:15 +01:00
joerg@trift2.
06a7d7be41
scripts/make_binary_distribution.sh
...
After-merge fix for bug#33536: The target to copy to is now called "$DEST".
2007-12-28 16:10:17 +01:00
joerg@trift2.
b74c11223e
Merge trift2.:/MySQL/M51/bug33536-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-28 15:50:44 +01:00
joerg@trift2.
6d693d1b7e
Merge trift2.:/MySQL/M50/bug33536-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-12-28 15:44:35 +01:00
joerg@trift2.
46b437cd3c
Merge trift2.:/MySQL/M50/bug33536-5.0
...
into trift2.:/MySQL/M51/bug33536-5.1
2007-12-28 15:26:55 +01:00
joerg@trift2.
9e1dbd5bd9
Merge trift2.:/MySQL/M41/bug33536-4.1
...
into trift2.:/MySQL/M50/bug33536-5.0
2007-12-28 13:31:24 +01:00
kent@kent-amd64.(none)
05c7156a35
Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-build
...
into mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build
2007-12-28 01:07:42 +01:00
kent@mysql.com/kent-amd64.(none)
18418ff8c5
make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:
...
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
2007-12-28 01:02:28 +01:00
joerg@trift2.
dc1fb0750a
scripts/make_binary_distribution.sh:
...
Fix the code to get the "libgcc" file name so that the failure of Intel's ICC
to provide this information does not cause any problems.
This fixes bug#33536 Option "--print-libgcc-file" does not work with ICC compiler
2007-12-27 19:51:06 +01:00
mkindahl@dl145h.mysql.com
bdea24f483
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-12-19 18:51:46 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
f988a7e600
Add new pkgplugindir handling to seperate plugins from libraries,
...
and allow override for binary distributions. Extend mysql_config
to print compiled-in plugin location for third-party plugins to
use. Resolves bug#31736.
2007-12-19 13:24:43 +00:00
joerg@trift2.
af73c6c867
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-17 13:40:06 +01:00
gluh@eagle.(none)
4f5868114a
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-12-13 15:56:04 +04:00
gluh@eagle.(none)
e039595029
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-12-13 14:52:49 +04:00
tsmith@ramayana.hindu.god
07c962393d
Bug #33192 : mysql_install_db bad merge, corrupt code == appears to succeed but does nothing
...
Repair a bad merge that made mysql_install_db silently fail, doing nothing.
2007-12-12 19:14:28 -07:00
df@pippilotta.erinye.com
ffa270d616
after-merge fix
2007-12-10 12:21:02 +01:00
df@pippilotta.erinye.com
42945c7726
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-12-10 12:16:41 +01:00
df@pippilotta.erinye.com
a079cb9f49
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 12:02:02 +01:00
tsmith@ramayana.hindu.god
95b791c7af
Bug #32679 : mysqld_safe looks for errmsg.sys in wrong path
...
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.
2007-12-03 18:19:35 -07:00
tsmith/mysqldev@mysql.com/production.mysql.com
da357f723a
Bug #32219 : too many hosts in default grant tables 6.0.3
...
Fix is to remove any references to the current hostname when running
mysql_install_db --cross-bootstrap. (The dist-hook make target makes
this call, and the resulting data directory is included in the source
distribution as win/data/*.)
Also, a few other clean-ups to mysql_install_db while there.
2007-11-30 06:14:43 +01:00
jonathan@chorlton.adsl.perkin.org.uk
247a84d400
Shell portability fix.
2007-11-29 16:40:46 +00:00
df@pippilotta.erinye.com
69ae57ae73
fix make distcheck in a different way
2007-11-28 17:32:28 +01:00
df@pippilotta.erinye.com
8765858d8a
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-28 17:08:40 +01:00
mkindahl@dl145h.mysql.com
0d13a48c25
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
2007-11-28 12:34:25 +01:00
msvensson@pilot.mysql.com
5ed3fdeabc
Use myisam as default storage engine when running mysqld in --bootstrap
...
mode
2007-11-26 18:46:05 +01:00
msvensson@shellback.(none)
d60eb19086
Add mysql-test/lib/*.sql to dists*
2007-11-23 18:12:14 +01:00
df@pippilotta.erinye.com
909fa65a1f
Fix make distcheck.
2007-11-23 13:38:59 +01:00
kaa@polly.(none)
816dc9f61a
Merge polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-11-22 17:26:10 +03:00
kaa@polly.(none)
07b8373602
Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-11-22 17:24:08 +03:00
kaa@polly.(none)
8c9efe2571
Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
...
into polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
2007-11-22 17:17:32 +03:00
kaa@polly.(none)
127f8e968e
Fixed build failures on Windows introduced by the patch for bug #32221 .
...
We do not have any executables in libmysql/release/ anymore.
2007-11-22 17:13:12 +03:00
jperkin@production.mysql.com
8cde2055ad
Remove the --source-install option and instead make use of --srcdir
...
to install system tables directly from the source tree (useful for
testing purposes). This helps clean the script up a lot and clarify
the three possible ways the script can be called (using compiled-in
paths, passing --basedir pointing to alternative install location,
or --srcdir). Include further tidying as well.
This fixes bug#30759.
2007-11-08 13:43:40 +01:00
joerg@trift2.
77c4bfe63a
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-10-29 12:56:48 +01:00
joerg@trift2.
242fdacdfe
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-10-22 11:18:01 +02:00