kostja@vajra.(none)
4eeee57c4b
Merge vajra.(none):/opt/local/work/mysql-5.0-runtime
...
into vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-04-14 18:35:09 -04:00
kostja@vajra.(none)
e0f0ba802f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-04-14 18:31:43 -04:00
kostja@vajra.(none)
58823d3bdd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into vajra.(none):/opt/local/work/mysql-5.0-runtime
2007-04-14 18:23:48 -04:00
kostja@vajra.(none)
8dcc629cad
Fix rpl_trigger.test failure in the runtime tree.
2007-04-14 17:05:41 -04:00
kostja@vajra.(none)
8b10ae74cc
Fix rpl_events test failure in the runtime tree.
2007-04-13 23:53:05 -04:00
kostja@vajra.(none)
eccd5ae201
An attempt to fix a sporadic valgrind memory leak in Event Scheduler:
...
streamline the event worker thread work flow and try to eliminate
possibilities for memory corruptions that might have been
lurking in previous (complicated) code.
This patch:
* removes Event_job_data::compile that was never used
* cleans up Event_job_data::execute to minimize juggling with
thread context and eliminate unneded code paths
* Implements Security_context::change/restore_security_context
to be able to re-use these methods in all stored programs
This is to maybe fix Bug#27733 "Valgrind failures in
remove_table_from_cache".
Review comments applied.
2007-04-13 16:35:56 -04:00
joerg@trift2.
3f72507d0d
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-04-12 19:09:29 +02:00
joerg@trift2.
3050edc0b9
Merge trift2.:/MySQL/M41/push-4.1
...
into trift2.:/MySQL/M50/push-5.0
2007-04-12 18:41:55 +02:00
anozdrin/alik@ibm.
9719af3f2b
Test case for BUG#5274: Stored procedure crash if length
...
of CHAR variable too great.
2007-04-12 19:42:45 +04:00
df@pippilotta.erinye.com
6d70fd8751
don't copy pdb files from the release target output folder, since this target does not build them
2007-04-11 14:27:03 +02:00
df@pippilotta.erinye.com
42499a4713
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:57:52 +02:00
df@pippilotta.erinye.com
e3bfb95665
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-04-11 13:49:04 +02:00
df@pippilotta.erinye.com
d09d2517cf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-11 13:37:05 +02:00
df@pippilotta.erinye.com
4869a255be
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-11 13:33:15 +02:00
df@pippilotta.erinye.com
f98d1614c3
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:32:40 +02:00
df@pippilotta.erinye.com
b51c346781
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1
make configure handle service pack version strings
2007-04-11 13:01:11 +02:00
df@pippilotta.erinye.com
7bff5112cc
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-04-11 08:06:36 +02:00
kent@mysql.com/kent-amd64.(none)
c92faf9d61
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
2007-04-11 01:51:33 +02:00
kent@mysql.com/kent-amd64.(none)
7e02bed924
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
2007-04-11 01:50:58 +02:00
kent@kent-amd64.(none)
d7286028c4
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-04-11 01:50:06 +02:00
kent@kent-amd64.(none)
473b1f31d5
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-04-11 01:48:43 +02:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf
my_memmem.c:
...
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
Use separate libtool convenience library for the bundled
zlib to embed into executables and shared libraries created,
and one to install into the pkglib directory
2007-04-11 01:47:42 +02:00
df@pippilotta.erinye.com
5197d7712c
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-10 13:15:07 +02:00
df@pippilotta.erinye.com
8e7e7d6b37
add a manual page back
2007-04-10 11:31:45 +02:00
holyfoot/hf@hfmain.(none)
26d2908c70
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:46:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
bd461b01f0
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:45:14 +05:00
holyfoot/hf@hfmain.(none)
87daef26a6
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:16:05 +05:00
holyfoot/hf@hfmain.(none)
33ed2ead2a
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:07:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
65535824ba
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-09 11:06:28 +05:00
kent@kent-amd64.(none)
a16289d550
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
2007-04-08 20:48:07 +02:00
kent@mysql.com/kent-amd64.(none)
c282dd3715
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
2007-04-08 20:46:40 +02:00
evgen@moonbone.local
d8e6b38ec1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
2007-04-07 23:09:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
171f8badd7
merging fix
2007-04-08 00:05:34 +05:00
Kristofer.Pettersson@naruto.
7d3c4c29da
Merge naruto.:C:/cpp/bug26121/my51-bug26121
...
into naruto.:C:/cpp/mysql-5.1-runtime
2007-04-07 21:03:35 +02:00
joerg@trift2.
da80df125a
Merge trift2.:/MySQL/M41/mysql-4.1
...
into trift2.:/MySQL/M41/push-4.1
2007-04-07 20:58:01 +02:00
joerg@trift2.
22f066e354
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
joerg@trift2.
d77ab7a009
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-04-07 20:30:26 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
7ceefd2b3f
after-merging fix
2007-04-07 23:16:03 +05:00
holyfoot/hf@hfmain.(none)
6ffa4b9c84
Merge mysql.com:/home/hf/work/26074/my51-26074
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 16:36:50 +05:00
holyfoot/hf@hfmain.(none)
fa153792ab
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 15:01:24 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
tomas@whalegate.ndb.mysql.com
e782e5d52b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
2007-04-07 09:18:43 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
1bc1eecd42
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:37:09 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
2a5bcc3f3e
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-04-07 11:36:02 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
df913ae06a
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/d2/hf/mrg/mysql-4.1-opt
2007-04-07 11:35:14 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
4a82c460a6
test temporarily disabled
2007-04-07 11:31:49 +05:00
kent/kboortz@production.mysql.com
9d380a2c29
Merge mysql.com:/tmp/mysql-5.0-build
...
into mysql.com:/tmp/mysql-5.1-build
2007-04-07 04:22:19 +02:00
kent/kboortz@mysql.com/production.mysql.com
c5fb034464
mysql.spec.sh:
...
Removed man page for "mysql_create_system_tables"
2007-04-07 04:14:44 +02:00
tomas@whalegate.ndb.mysql.com
254ad34300
disabled test and feature
2007-04-07 00:28:09 +02:00