Commit graph

220 commits

Author SHA1 Message Date
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
2007-07-30 21:45:06 +02:00
kent@mysql.com/kent-amd64.(none)
a9d2569cba Generate "config.h" directly into the "include" directory, later copied
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
2007-07-30 21:09:45 +02:00
jperkin@production.mysql.com
87a297061c Merge production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.0
into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1
2007-07-27 20:28:34 +02:00
jperkin@production.mysql.com
8f87bd6008 Clean up the mysql_install_db script to ensure that a sane environment is
available and reduce the chance of failure.  This should fix bug#28585
which is caused by the script being quite random in how it finds files it
requires and not giving very good feedback to the user about what went
wrong.

Also update make_binary_distribution so that it provides the correct path
to the required SQL scripts when generating mysql_install_db.  The script
only previously worked because of the permissive behaviour which looked
around the current working directory before the "correct" location.  This
could lead to severe problems if the user happened to run the script from
a location which contained older or even broken copies of the SQL scripts.

We now require either a complete binary release (and the mysql_install_db
script ran from inside the extracted archive), or an installed compiled
tree, as this is the only way we can be sure everything that we need is
available and ready to run.

While working on this fix, also clean up the mysql_install_db script a lot
to make it simpler, easier to read, and hopefully less prone to bugs in
the future.
2007-07-26 12:57:46 +02:00
df@pippilotta.erinye.com
3c2baf3e66 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-07-20 11:41:25 +02:00
df@pippilotta.erinye.com
a51493a4a0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-07-20 09:20:48 +02:00
joerg@trift2.
59588dff9a Merge trift2.:/MySQL/M50/bug21023-25486-5.0
into  trift2.:/MySQL/M51/bug21023-25486-5.1
2007-07-17 21:11:22 +02:00
joerg@trift2.
cb28594deb Ensure "mysql-stress-test.pl" is included in both "tar.gz" and RPM packages.
Fixing bug#21023:  "mysql-stress-test.pl" missing in builds
2007-07-17 16:25:32 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
0e98bed903 make_binary_distribution.sh:
BUG#29382
2007-07-17 10:25:48 +02:00
joerg@trift2.
49dc9c5971 Merge trift2.:/MySQL/M50/bug26609-5.0
into  trift2.:/MySQL/M51/bug26609-5.1
2007-05-22 17:51:51 +02:00
joerg@trift2.
b0677f1ddc scripts/make_binary_distribution.sh :
Include all the additional test suites in the binary packages ("tar.gz").
This is the tar.gz part of the fixes for bug#26609; for RPMs it is already done.
2007-05-22 17:06:47 +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
kent@kent-amd64.(none)
6a8582a8bc Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build
into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build
2007-04-05 08:42:32 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b zlib.m4:
Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
Makefile.am:
  Always build the bundled zlib static only
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"
2007-04-05 08:36:56 +02:00
df@pippilotta.erinye.com
062ccf6905 BUG#27489 build fix 2007-04-02 15:20:46 +02:00
msvensson@pilot.blaudden
709f066948 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-19 11:15:59 +01:00
msvensson@pilot.blaudden
88b4c86e09 Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Build sql files for netware from the mysql_system_tables*.sq files
 - Fix comments about mysql_create_system_tables.sh
 - Use mysql_install_db.sh to create system tables for mysql_test-run-shell
 - Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
2007-03-16 17:28:32 +01:00
tsmith@quadxeon.mysql.com
de61dde90b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
2007-03-08 01:00:49 +01:00
msvensson@pilot.blaudden
d56d34805c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-02-28 20:45:07 +01:00
msvensson@pilot.blaudden
0b4598a4b3 Bug #20166 mysql-test-run.pl does not test system privilege tables creation
- No .sql files in mysql-test/lib/ anymore, don't copy them
2007-02-28 20:44:49 +01:00
joerg@trift2.
ea2261d1a1 A binary package should also contain the "mysqld-debug" server (backport from 5.1). 2007-02-28 11:23:00 +01:00
kent@kent-amd64.(none)
f4ab936ff1 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1
2007-02-12 23:37:12 +01:00
kent@mysql.com/kent-amd64.(none)
3bb1114647 make_binary_distribution.sh:
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
2007-02-09 00:10:40 +01:00
tsmith@siva.hindu.god
cc7afe2494 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05: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)
1a0e36ea6d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644 mysql.spec.sh, make_binary_distribution.sh:
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture
2007-01-05 16:53:03 +01: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
8075fc447e Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into  siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-21 18:23:14 -07:00
tsmith/tim@siva.hindu.god
f204db4dd1 Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-21 18:20:09 -07:00
joerg@trift2.
7f0cb242bc Merge trift2.:/MySQL/M50/upward-5.0
into  trift2.:/MySQL/M51/push-5.1
2006-12-20 19:24:04 +01:00
df@kahlann.erinye.com
905d9e848c also include data files for varbinary test in binary distribution 2006-12-15 17:57:31 +01:00
msvensson@neptunus.(none)
aba988485a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-08 16:53:59 +01:00
msvensson@neptunus.(none)
0b41593db6 Fix problems with "make dist" and running from "binary dist" 2006-12-08 12:13:43 +01: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
df@kahlann.erinye.com
a3d8fdbeb9 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
into  kahlann.erinye.com:/home/df/mysql/build/51
2006-11-14 14:49:45 +01:00
df@kahlann.erinye.com
4dd2d7062a Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-14 14:48:29 +01:00
df@kahlann.erinye.com
5d8525c6f7 make_binary_distribution should of course also copy .test files from mysql-test/include 2006-11-14 14:44:20 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e209edaa32 Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic
into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic
2006-11-07 23:01:38 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1d932b992c Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
2006-11-07 22:55:19 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
7364bc113e Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic
2006-11-07 22:49:46 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3d7a9bdd6b make_binary_distribution.sh:
Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
2006-11-07 22:26:37 +01:00
msvensson@neptunus.(none)
2459dd55f5 Copy *.cnf file from std_data/ when doing a binary distribution 2006-10-23 10:56:13 +02:00
jonas@perch.ndb.mysql.com
2f7b2611f7 ndb - remove duplicate solution to ndb_restore_compat make_binary_distribution problem 2006-10-17 15:05:31 +02:00
jonas@perch.ndb.mysql.com
44e0587486 ndb - ndb_restore_compat
Update make_binary_distribution.sh
  Make sure all files needed for testing are included
2006-10-17 13:34:00 +02:00
kent@mysql.com/c-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8692bb53a3 make_binary_distribution.sh:
Split copy of result files to avoid shell limit.
  Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
2006-10-16 02:07:50 +02:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e mysql.spec.sh:
Added "test" RPM package
  Install all binaries "make install" would
make_binary_distribution.sh:
  Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
2006-09-24 00:41:20 +02:00