hhunger@hh-nb.hungers
10ba1a635a
Disabled storedproc_06 for all engines due to bug 33464.
2008-01-09 10:38:56 +01:00
hhunger@hh-nb.hungers
c47c143464
WL#4084: Code changes due to enabled the disabled tests (including other improvements).
2008-01-08 13:56:01 +01: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.
615d4936eb
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-12-28 15:55:38 +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
joerg@trift2.
a0fbcc0326
Merge trift2.:/MySQL/M50/merge-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-12-21 13:13:22 +01:00
joerg@trift2.
9f96125023
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-21 12:53:05 +01:00
joerg@trift2.
bf1ba3d416
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/merge-5.0
2007-12-21 12:48:14 +01:00
df@pippilotta.erinye.com
bea1bfd5c7
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-21 09:44:08 +01:00
df@pippilotta.erinye.com
f25c6ffaee
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-21 09:40:53 +01:00
df@pippilotta.erinye.com
f7527b7856
BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump
2007-12-20 21:37:21 +01:00
brian@zim.(none)
97e3c6cbf4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/bk/mysql-5.1-arch
2007-12-20 12:32:16 -08:00
brian@zim.(none)
4316829b75
client_priv.h:
...
Removed dead option
mysqlslap.c:
Updates from Paul for help.
Removed dead option
2007-12-20 12:23:35 -08:00
df@pippilotta.erinye.com
92de4d5e78
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-17 19:08:55 +01:00
df@pippilotta.erinye.com
01b6c78fbe
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-12-17 19:01:14 +01:00
joerg@trift2.
e591fc7cb8
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-12-17 14:10:01 +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
joerg@trift2.
7bd4ac4df7
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-12-17 13:36:17 +01:00
kostja@bodhi.(none)
16f0bd712e
Try to fix assertion failures at slave shutdown when running
...
rpl_ndb tests on sapsrv1.
2007-12-15 22:24:01 +03:00
kostja@bodhi.(none)
2e82e66677
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 17:05:39 +03:00
kostja@bodhi.(none)
4bb503568d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-12-15 17:00:18 +03:00
kostja@bodhi.(none)
bffc615e6c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 16:59:43 +03:00
malff@lambda.hsd1.co.comcast.net.
0488056ca8
WL#4165 (Prepared statements: validation)
...
Adding the tests cases alone for WL#4165, disabled
2007-12-14 17:46:24 -07:00
iggy@amd64.(none)
6bb288b6b7
Bug#26811 Symbolic links don't work in Windows Vista
...
- Enable check for symbolic link files.
2007-12-14 15:49:51 -05:00
kent/mysqldev@mysql.com/production.mysql.com
fb8cceb06e
sp_head.cc:
...
Corrected typo
2007-12-14 21:38:58 +01:00
kent/mysqldev@mysql.com/production.mysql.com
7ca11181ac
sp_head.cc:
...
Made sp_head::operator delete() match prototype, added throw()
mysql_test_run.c, mysqld_safe.c:
Include "mysql_version.h" to get MYSQL_PORT defined
2007-12-14 18:23:11 +01:00
tomas@whalegate.ndb.mysql.com
2db742573d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 18:05:15 +01:00
tomas@whalegate.ndb.mysql.com
1a3bf7333e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-12-14 18:03:44 +01:00
tomas@whalegate.ndb.mysql.com
d2a93fd60b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-14 17:49:58 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
8105bd467b
Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
...
into chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
2007-12-14 16:02:31 +00:00
kent/mysqldev@mysql.com/production.mysql.com
028ed33610
Raise version number after cloning 5.0.54
2007-12-14 16:58:12 +01:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
2a404c23ba
Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
2007-12-14 15:46:19 +00:00
jperkin/jonathan@chorlton.adsl.perkin.org.uk
89153ffa1b
post-commit:
...
Rationalise setting $FROM.
2007-12-14 15:43:54 +00:00
anozdrin/alik@station.
6ebedc8635
Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
2007-12-14 16:45:17 +03:00
anozdrin/alik@station.
151444c626
Merge station.:/mnt/raid/alik/MySQL/devel/5.1
...
into station.:/mnt/raid/alik/MySQL/devel/5.1-rt
2007-12-14 16:30:22 +03:00
anozdrin/alik@station.
61b903f896
Merge station.:/mnt/raid/alik/MySQL/devel/5.0
...
into station.:/mnt/raid/alik/MySQL/devel/5.0-rt
2007-12-14 15:57:36 +03:00
tsmith@ramayana.hindu.god
3a6b30527b
Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b33192/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2007-12-14 04:26:06 -07:00
df@pippilotta.erinye.com
04d815cf39
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-14 10:52:21 +01:00
df@pippilotta.erinye.com
26bd6a2cf1
typo
2007-12-14 10:51:05 +01:00
df@pippilotta.erinye.com
be2d78e397
BUG#31880 make test failure from public bk tree
2007-12-14 10:47:01 +01:00
tomas@whalegate.ndb.mysql.com
0f58ed97c1
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-14 08:20:07 +01:00