Commit graph

1351 commits

Author SHA1 Message Date
davi@mysql.com/endora.local
5d725bfdf8 Bug#35824: mysql_upgrade does not fix scheduler tables when upgrading from 5.1.23 to 5.1.24
The problem is that when upgrading the event table, the sql_mode
column was always being added instead of being updated to list new
sql_mode values, causing upgrades of the event which already have
a sql_mode column to not be updated to the new sql_mode values.

The solution is to always add first a stub sql_mode column and
subsequently update the column to the new sql_mode values.
2008-04-04 13:46:05 -03:00
joerg@trift2.
e784898959 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-03-14 14:41:08 +01:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-12 11:19:46 +03:00
kent@kent-amd64.(none)
006adbd412 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-03-11 15:28:45 +01:00
kent@mysql.com/kent-amd64.(none)
878b333680 make_win_bin_dist:
Include .pdb files for tools and libraries (bug#35104)
2008-03-11 15:21:58 +01:00
tnurnberg@white.intern.koehntopp.de
10bf47abf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  mysql.com:/misc/mysql/29645/51-29645
2008-03-10 06:52:32 +01:00
tnurnberg@white.intern.koehntopp.de
6ad2340f63 Merge mysql.com:/misc/mysql/29645/50-29645
into  mysql.com:/misc/mysql/29645/51-29645
2008-03-10 06:44:31 +01:00
iggy@amd64.(none)
3f7a608f0e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  amd64.(none):/src/bug27101/my51-bug27101
2008-03-07 16:10:55 -05:00
iggy@amd64.(none)
de35f05a88 Merge amd64.(none):/src/bug27101/my50-bug27101
into  amd64.(none):/src/bug27101/my51-bug27101
2008-03-07 16:01:13 -05:00
iggy@amd64.(none)
c6f63bc5bb Bug #27101 mysqlhotcopy --record_log_pos retrieves wrong slave parameters
- Make sure mysqlhotcopy doesn't create unrestorable slaves.
2008-03-07 15:45:40 -05:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
2ebdd5ea2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/build/5.1
2008-03-06 15:13:14 +00:00
tnurnberg@mysql.com/white.intern.koehntopp.de
874e919872 Bug#29645: Link failure when using the embedded server
mysql_config --cflags gave a flag that forced the HP/UX
C++ compiler into C-mode; as a result, C++ sources could
not be compiled correctly.

We now filter out the offending flag (like we do for Sun)
so that --cflags will work for both C and C++.
2008-02-25 07:50:55 +01:00
tsmith@ramayana.hindu.god
45442d08d4 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-22 17:08:01 -07:00
tsmith@ramayana.hindu.god
a5e90661d8 Merge ramayana.hindu.god:/home/tsmith/m/bk/b28460/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-22 17:04:28 -07:00
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