1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-14 13:41:20 +03:00
Commit Graph

325 Commits

Author SHA1 Message Date
f6ede396c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:55:12 +02:00
b050f975c4 Merge 2006-05-02 02:45:04 +02:00
e8fb05845b Merge 2006-05-01 20:16:19 +02:00
f45d6d3cc6 mysql.spec.sh:
Use "./libtool --mode=execute" to find real path to executables
2006-05-01 19:48:31 +02:00
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 13:27:38 -07:00
b714a0cec4 mysql.spec.sh:
Backport of changes in 5.0 (bug#18294)
2006-04-29 01:28:04 +02:00
50e8ba04cf mysql.spec.sh:
Include and run mysql_upgrade if needed (bug#19353)
2006-04-28 17:03:11 +02:00
59bced7f8a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-26 15:16:21 +02:00
5d5a947f4c Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-26 15:13:43 +02:00
a8f407a7ef Add ndb_config to rpm spec 2006-04-26 14:54:20 +02:00
4cfc378096 Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping 2006-04-13 13:10:00 -07:00
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
2006-04-13 10:34:46 -07:00
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
5e28df35af Merge 2006-04-01 05:53:37 +02:00
02c661dbcc Makefile.am:
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
  Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
2006-04-01 05:44:10 +02:00
b1dfda9b7f mysql.spec.sh:
Changed product name from "Community Edition" to "Community Server", bug#17970
2006-03-07 18:53:26 +01:00
16933400fc mysql.spec.sh:
Enabled fast mutexes, now default is off
2006-03-06 14:57:41 +01:00
ab77867efb Merge 2006-03-06 13:50:52 +01:00
2ffb679a27 mysql.spec.sh:
Use installed libz.a to avoid hard to solve static linking problems
2006-03-03 20:30:28 +01:00
7ae10acbc4 mysql.spec.sh:
Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00
2e82e5aef8 Fix the changelog entry header, format was wrong 2006-02-21 15:39:43 -05:00
281e0d0c6b mysql.spec.sh:
Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'
2006-02-20 03:10:08 +01:00
088bc804aa mysql.spec.sh:
Only install a subset of shared libraries created
2006-02-17 16:38:32 +01:00
868b1678e7 support-files/mysql.spec.sh : Use "-i" on "make test-force", add missing changelog notes. 2006-02-13 19:07:40 +01:00
49caf76e59 support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog. 2006-02-10 18:07:14 +01:00
ceaf0017e3 support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation. 2006-02-10 17:40:04 +01:00
9f86a9bdcc Makefile.am:
Link with CLIENT_EXTRA_LDFLAGS, enable us to
  pass on libtool flags '-full-static' and '-static'
  using '--with-client-ldflags' to configure.
mysql.spec.sh:
  Pass '-static' to libtool, link static with our
  own libraries, dynamic with system libraries.
  Link with the bundled zlib.
2006-02-09 03:11:45 +01:00
920ac3a094 Modified RPM spec to match new 5.1 debug+max combined community packaging. 2006-02-08 11:42:17 +01:00
2205d1b8d5 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file
2005-12-19 01:12:11 +01:00
acc6609bfd * made the following changes for the generic 5.1 RPM spec file
- Added zlib to the list of (static) libraries installed
- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
- Compile MySQL with bundled zlib
- Fixed %packager name to "MySQL Production Engineering Team"
2005-12-12 17:45:54 -03:00
ea54b05897 mysql.spec.sh:
* made the following changes for the generic 5.0 RPM spec file
  - Added zlib to the list of (static) libraries installed
  - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
  - Compile MySQL with bundled zlib
  - Fixed %packager name to "MySQL Production Engineering Team"
2005-12-12 17:29:02 -03:00
2eb0e9a43c Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2005-12-05 19:00:00 +01:00
b9451ee51f Merge from 4.1, partly manual. 2005-12-05 18:33:48 +01:00
7ce92291f0 Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
(Backport of an identical change from 5.0)
2005-12-05 17:53:42 +01:00
9b0bfb8858 Manual merge from 4.1 (bug#15145). 2005-11-22 20:30:45 +01:00
511fbac4df Manual merge from 4.1, bug#15145. 2005-11-22 20:15:54 +01:00
c735d07dec support-files/mysql.spec.sh
Fix a possible problem on RPM un-install. bug#15145
2005-11-22 19:58:58 +01:00
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
9f065041fc Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this. 2005-11-11 22:18:41 +01:00
0f373f9501 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 01:27:15 +03:00
79aaf0754d mysql.spec.sh:
Always use bundled zlib
2005-11-05 01:44:35 +01:00
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
7decf21c02 - after merge fix: removed pack_isam from the RPM spec file list again 2005-10-28 16:50:52 +02:00
303ba37044 - added man page for the mysqlmanager in the RPM spec file list 2005-10-28 13:31:19 +02:00
8303ca007a - after merge fixes 2005-10-28 11:10:29 +02:00
0f3192323c - fixed RPM spec file list after merge, removed dupes 2005-10-28 10:46:07 +02:00
6b123044d0 - after merge fixes 2005-10-27 16:53:14 +02:00
f793d7b5bf - Removed obsolete and outdated man page files from the man
directory - these files are now maintained in the mysqldoc
   repository and included in the source distribution during the
   release build. Updated the configure.in script and Makefiles to
   create the man page file list at build time
 - Updated the file list in the RPM spec file to include all currently
   available man pages (this can not be done with wildcards, as
   the man pages are spread across several subpackages. However, RPM
   warns about unpackaged files, so newly added man pages can be 
   spotted)
2005-10-27 14:51:58 +02:00
e3c4993bf3 mysql.spec.sh:
Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00