Commit graph

42519 commits

Author SHA1 Message Date
kent@kent-amd64.(none)
f8c66fe926 Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
2007-01-31 00:30:53 +01:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f gen_lex_hash.cc:
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
  Removed C version of mysql-test-run
mysql.spec.sh:
  Specify GPL license only in GPL sources
.del-my_manage.h:
  Delete: mysql-test/my_manage.h
mysql.spec.sh:
  Added GPL header
.del-mysql_test_run_new.c:
  Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
  Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
  Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
  Delete: mysql-test/my_manage.c
2007-01-31 00:06:42 +01:00
df@kahlann.erinye.com
16865c1ad2 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2007-01-30 18:43:23 +01:00
df@kahlann.erinye.com
95275e28f2 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-25530
2007-01-30 13:57:36 +01:00
df@kahlann.erinye.com
455b903f28 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530
2007-01-30 13:53:48 +01:00
df@kahlann.erinye.com
8fa8c6f46b Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-opt
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
2007-01-29 15:35:20 +01:00
df@kahlann.erinye.com
db86c6036b Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1.15-release
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
2007-01-29 15:33:19 +01:00
df@kahlann.erinye.com
7ce0bd7a5e apply holyfoot's patch for BUG#25895 2007-01-29 14:47:38 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
6391613d32 bug #25895 (compiling the embedded server fails on some 64-bit platforms)
it can't be compile everywhere if we just cast pointer to pthread_t
So now we use correct pthread_self() value as the pthread_t and
pointer where we need to identify the thread exactly.
2007-01-29 17:39:28 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
6679490dc6 bug #25890 (mysqltest_embedded crashes on start)
binlog_filter and rpl_filter are initialized in server's 'main' function
which doesn't work in the embedded server. So this code moved to
function working in both cases.
2007-01-29 15:26:27 +04:00
df@kahlann.erinye.com
eadd2c4eef Build fix for sunfire100b. This can go when BUG#14420 is fixed. 2007-01-27 22:07:52 +01:00
df@kahlann.erinye.com
a4208cdc1c BUG#25890 put previous fix in better place 2007-01-27 21:26:28 +01:00
df@kahlann.erinye.com
26c6d2d231 BUG#25895 compiling the server with embedded fails on several 64-bit platforms
temporary fix
2007-01-27 20:16:15 +01:00
df@kahlann.erinye.com
508d7da976 BUG#25890 mysqltest_embedded crashes on start
very temporary fix
2007-01-27 13:12:59 +01:00
df@kahlann.erinye.com
199f7b46b6 fix order in spec file changelog 2007-01-27 12:46:20 +01:00
gluh@eagle.(none)
30d927dab9 Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:40 +04:00
gluh@eagle.(none)
67db27537b Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:01 +04:00
gluh@mysql.com/eagle.(none)
45f61a06fb Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.0
2007-01-26 16:36:50 +04:00
dlenev@mockturtle.local
4fd3b03e71 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 21:55:44 +03:00
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
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
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