Commit graph

184 commits

Author SHA1 Message Date
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
cmiller@zippy.cornsilk.net
a16eaf3301 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4 Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
2006-12-08 16:39:58 -07:00
tsmith/tim@siva.hindu.god
d54c696c24 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
2006-12-08 16:26:41 -07:00
tsmith/tim@siva.hindu.god
a58d08513b Makefile.am
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets
2006-12-08 16:17:46 -07:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
33c248eee5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-12-04 19:06:42 +01:00
kent@kent-amd64.(none)
2b5e2230bb Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-12-02 23:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh:
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
2006-12-02 23:16:47 +01:00
df@kahlann.erinye.com
4e76f699b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:20:23 +01:00
monty@narttu.mysql.fi
2e8d2e3ef9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-11-29 22:54:11 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
2006-11-29 22:51:09 +02:00
kent@kent-amd64.(none)
4ed32e0448 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 20:25:20 +01:00
kent@mysql.com/kent-amd64.(none)
cae575a390 Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-29 20:24:41 +01:00
kent@mysql.com/kent-amd64.(none)
3643b3689f Makefile.am:
Remove soft links before creating source TAR, to avoid file copies (bug#11865)
2006-11-29 20:22:58 +01:00
kent@kent-amd64.(none)
e5ebcd1653 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 19:42:19 +01:00
kent@mysql.com/kent-amd64.(none)
c048bf11ab Makefile.am:
Corrected change to create "win" directory
2006-11-29 19:41:48 +01:00
kent@kent-amd64.(none)
ffe9fcf123 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-29 19:37:59 +01:00
kent@mysql.com/kent-amd64.(none)
43eba545f3 Makefile.am:
"make distcheck" fix, "win" directory
2006-11-29 19:35:40 +01:00
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-28 21:11:05 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
gkodinov/kgeorge@macbook.gmz
de08856720 fix for the merge of --mem support in autopush.pl in 5.1-opt 2006-11-20 13:42:22 +02:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00
holyfoot/hf@mysql.com/deer.(none)
e7cde72651 merging 2006-11-16 23:00:48 +04:00
msvensson@neptunus.(none)
0b60b7d59a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-13 19:19:02 +01:00
msvensson@neptunus.(none)
e09df84aa5 Remove test-force-pl-mem and add test-force-mem 2006-11-13 19:16:23 +01:00
gkodinov/kgeorge@macbook.gmz
eb1a8fcd3c Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.1-opt
2006-11-09 12:27:53 +02:00
gkodinov/kgeorge@macbook.gmz
1a8204f242 Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-4.1-opt
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt
2006-11-08 16:41:12 +02:00
gkodinov/kgeorge@macbook.gmz
c7866bd569 Make a new test target for autopush.pl to run memory based tests 2006-11-08 15:15:56 +02:00
msvensson@shellback.(none)
f60e544902 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-14 17:31:04 +02:00
msvensson@neptunus.(none)
3eaeeca6de Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into  neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
2006-10-06 01:00:35 +02:00
msvensson@neptunus.(none)
15ffeaa093 Add target to Makefile which uses the much faster --mem switch to mysql-test-run.pl 2006-10-05 23:19:32 +02:00
scottlee@calico.site
3eaee36070 Back port change from 5.1 that adds the Windows database files to the source package.
This is needed for WiX pacakging.
2006-10-02 23:05:52 -04:00
guilhem@gbichot3.local
09c5a83416 WL#3504 "plugin actions for engines' and plugins' unit tests"
for push in 5.1 (I will inform Trudy).
Storage engines and plugins can now have unit tests to test their components; such
test must be an executable C/C++ program which name ends with '-t' and which is
obeys the mytap protocol, it must be stored in the storage engine's or plugin's
source directory (storage/<engine> or plugin/<plugin>) or any subdirectories of
this.
The top-level Makefile target "test-unit" will run all unit tests: it will scan
the engines' and plugins' directories, recursively, and execute all executable
files which name ends with '-t'."
2006-09-15 15:15:24 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 13:34:44 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
ebaaee05e1 WL#3368 mixed format as default
Two minor fixes:
 1. to make make test executes with mixed;
 2. proper isolation of binlog_statement_insert_delayed 
    from others through reset master cleaning up binlog
    todo: adapt this technique to other restarting for binlog tests
2006-08-30 21:43:05 +03:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
serg@serg.mylan
25d0962cbe change test targets to be more modular. include unit tests into make test 2006-06-14 09:12:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
serg@sergbook.mysql.com
506f9800bd fixes 2006-04-30 15:52:30 -04:00
acurtis@xiphis.org
53d4594cfe Merge xiphis.org:/home/antony/work2/wl3201.3
into  xiphis.org:/home/antony/work2/wl3201.merge
2006-04-24 13:36:15 -07:00
acurtis@xiphis.org
4e11a4d941 WL#3201
" Configure support for server plugins "
2006-04-13 13:49:29 -07:00
jimw@mysql.com
66c29e0f49 Merge mysql.com:/home/jimw/my/mysql-5.1-clean
into  mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
2006-04-13 10:37:57 -07:00