Commit graph

1326 commits

Author SHA1 Message Date
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
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
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
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
antony@pcg5ppc.xiphis.org
3b95727600 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-10-19 13:06:37 -07:00
joerg@trift2.
5e95b3c34c Merge trift2.:/MySQL/M51/bug31644-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 19:22:27 +02:00
joerg@trift2.
eee35f91f0 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-19 19:19:15 +02:00
joerg@trift2.
f3668c9f03 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M51/bug31644-5.1
2007-10-19 19:06:30 +02:00
malff@lambda.hsd1.co.comcast.net.
94b4f4a870 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 19:21:07 -06:00
antony@pcg5ppc.xiphis.org
f4a153c3c4 Bug#31473
"CSV does not work with NULL value in datetime fields"
  Attempting to insert a row with a NULL value for a DATETIME field
  results in a CSV file which the storage engine cannot read.
  Don't blindly assume that "0" is acceptable for all field types,
  Since CSV does not support NULL, we find out from the field the
  default non-null value.
  Do not permit the creation of a table with a nullable columns.
2007-10-18 14:48:04 -07:00
joerg@trift2.
a238d6e280 Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original
and the modified values of the compile-related variables used in "configure".

Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".

This fixes bug#31644
   Values of *FLAGS that were used for building packages is missed in mysqlbug
2007-10-18 12:03:30 +02:00
anozdrin/alik@station.
49a0f09bbf Fix for BUG#24923: Functions with ENUM issues.
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.
2007-10-17 12:13:56 +04:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-10 14:15:09 -06:00
tsmith@ramayana.hindu.god
070dc3ffb5 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-10-10 14:12:36 -06:00
cmiller@zippy.cornsilk.net
04296df344 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-10-08 12:40:21 -04:00