dfischer/mysqldev@mysql.com/production.mysql.com
70a74003fc
Raise version number after cloning 5.1.15-beta
2007-01-25 18:19:49 +01:00
joerg@trift2.
32e83a6c3d
For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide
...
additional files that specify some actions which are allowed to the MySQL binaries.
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.
This fixes bug#12676.
2007-01-25 17:51:21 +01:00
kaa@polly.local
46b3a3d7dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-25 15:50:26 +03:00
kaa@polly.local
603475cbf9
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-25 15:47:19 +03:00
jani/jamppa@bk-internal.mysql.com
181865cac3
SETUP.sh:
...
Don't use -Wshadow by default yet
2007-01-25 13:12:02 +01:00
dlenev@mockturtle.local
631d3c9c1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 14:58:45 +03:00
jani/jamppa@bk-internal.mysql.com
031c729eca
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new-ndb
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:38:35 +01:00
jani/jamppa@bk-internal.mysql.com
dd6292d6d1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-01-25 12:28:00 +01:00
tomas@poseidon.mysql.com
44c483cdda
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 18:14:51 +07:00
dlenev@mockturtle.local
3a4ae93a4f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 12:40:11 +03:00
dlenev@mockturtle.local
8b69d169d4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-25 11:26:18 +03:00
dlenev@mockturtle.local
c06a385916
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 11:26:07 +03:00
df@kahlann.erinye.com
d938549e2e
merge fix
2007-01-25 09:18:10 +01:00
df@kahlann.erinye.com
fdd8410e59
BUG#25530 --with-readline fails with commercial source packages
2007-01-25 08:46:07 +01:00
sergefp@mysql.com
8a3592d4e2
BUG#24127: merge: update tests results
2007-01-25 10:00:09 +03:00
tomas@poseidon.mysql.com
6c03020b01
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 11:21:04 +07:00
tomas@poseidon.mysql.com
46bcfff2a5
ndb:
...
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
2007-01-25 11:17:51 +07:00
sergefp@pylon.mylan
cec2e8a66e
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
...
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
2007-01-25 02:30:36 +03:00
sergefp@mysql.com
4908cf0772
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-25 02:28:53 +03:00
sergefp@mysql.com
39e6de4359
BUG#24127: wrong result for (null,not-null) IN (SELECT a,b ...):
...
Fixed typo problem that surfaced after the merge
2007-01-25 02:27:28 +03:00
svoj@april.(none)
f05c519a6b
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:51:13 +04:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
malff/marcsql@weblab.(none)
a97b3d374d
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
2007-01-24 14:43:09 -07:00
malff/marcsql@weblab.(none)
3ae384d04f
Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)
...
The build scripts in general, using automake, autoconf, etc, contain several
special commands and work around all related to the way the bison code in the
parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
time during development, ultimately cause the build scripts to be unstable
and cause build defects by not enforcing dependencies.
This fix simplifies the build process and aligns it with the automake tooling,
which provides native support for bison and *.yy files.
In particular, the following problem have been fixed:
- dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
corrupted builds,
- the work around introduced by Bug 24557, to cleanup the generated files
sql_yacc.h and sql_yacc.cc, has been removed,
- the generated makefile, in a source distribution, used to destroy the files
sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
these files are now removed by make maintainer-clean.
- The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
clearly documented, and the "sed" hack has been replaced by a cleaner
work around, when building the code with bison 1.875.
- Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
- Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
2007-01-24 14:40:39 -07:00
svoj@mysql.com/april.(none)
de1572d687
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:31:58 +04:00
svoj@mysql.com/april.(none)
ea7fe60fbc
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-01-25 01:26:57 +04:00
sergefp@pylon.mylan
5bc7d596cc
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
...
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
2007-01-24 22:28:28 +03:00
sergefp@mysql.com
cced625508
BUG#24127: merge fixes: If subselect is a union, dont allocate several
...
identical pushed_cond_guards arrays. Allocate only one always.
2007-01-24 22:23:50 +03:00
dlenev@mockturtle.local
81c908f200
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 22:15:14 +03:00
dlenev@mockturtle.local
37110aad7f
Disabling back im_daemon_life_cycle.test, which was temporarily enabled in
...
the team tree for additional investigation.
2007-01-24 22:11:27 +03:00
brian@zim.(none)
2ccd38169f
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-24 10:34:05 -08:00
brian@zim.(none)
099c634d62
This patch passes comment to be embedded in ARZ.
...
Fixes autodiscovery of tables.
Allows the FRM to be extracted from the ARZ file via archive_reader.
2007-01-24 10:30:06 -08:00
monty@narttu.mysql.fi
c022454e7c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-24 19:53:51 +02:00
istruewing@chilla.local
06a8c16f6f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-24 17:35:14 +01:00
dlenev@mockturtle.local
c762789096
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-merge
2007-01-24 19:33:06 +03:00
dlenev@mockturtle.local
86f36eb089
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 19:26:06 +03:00
sergefp@mysql.com
e2f0f4dbd3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-24 19:13:28 +03:00
gluh@eagle.(none)
0e949c6ada
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 20:12:32 +04:00
gluh@mysql.com/eagle.(none)
a548a54c61
after merge fix
2007-01-24 20:11:36 +04:00
gluh@eagle.(none)
7b291e36cf
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-24 19:54:40 +04:00
gluh@mysql.com/eagle.(none)
a7acea61de
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-01-24 19:24:16 +04:00
istruewing@chilla.local
0dc064536f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug24607
2007-01-24 15:52:19 +01:00
istruewing@chilla.local
b9b3120580
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-24 15:47:04 +01:00
istruewing@chilla.local
e74331b3f7
After merge fix
2007-01-24 15:45:41 +01:00
kaa@polly.local
e914eb690c
Merge polly.local:/tmp/maint/bug6774/my51-bug6774
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-24 17:34:31 +03:00
kaa@polly.local
c5a1c578f5
Merge polly.local:/tmp/maint/bug6774/my50-bug6774
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-24 17:30:01 +03:00
iggy@recycle.(none)
54ce485557
Merge recycle.(none):/src/bug24496/my50-bug24496
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-24 09:29:50 -05:00
iggy@recycle.(none)
d554b1f725
Merge recycle.(none):/src/bug24496/my51-bug24496
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-24 09:29:05 -05:00
kaa@polly.local
866ab1c205
Merge polly.local:/tmp/maint/bug6774/my50-bug6774
...
into polly.local:/tmp/maint/bug6774/my51-bug6774
2007-01-24 17:12:42 +03:00
gkodinov/kgeorge@macbook.gmz
7fd3cd9e41
Merge bk-internal:/home/bk/mysql-5.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-24 15:57:58 +02:00