mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45814 commits 2784 branches 343 tags 1.6 GiB
Commit graph

601 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
0e4d97edf0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
c76adf6021 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
dc9c3b5ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-17 14:45:08 +01:00
hartmut@walhalla.site
f4e097420a This command is not portable, as POSIX does not require it; use . instead. 
(Bug #24294)
 2006-11-16 23:39:02 +01:00
joerg@trift2.
43cd9427e2 Merge trift2.:/MySQL/M50/bug22081-5.0 
into  trift2.:/MySQL/M51/bug22081-5.1
 2006-11-16 15:16:51 +01:00
joerg@trift2.
818f3fa21f Merge trift2.:/MySQL/M41/bug22081-4.1 
into  trift2.:/MySQL/M50/bug22081-5.0
 2006-11-16 14:38:15 +01:00
joerg@trift2.
29dd8d2e58 support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081). 2006-11-16 14:01:31 +01:00
joerg@trift2.
844d5161fc Merge trift2.:/MySQL/M41/spec-mtr-4.1 
into  trift2.:/MySQL/M50/spec-mtr-5.0
 2006-11-15 20:34:44 +01:00
joerg@trift2.
65d6b24ed9 support-files/mysql.spec.sh : Use "report features" in the first test run. 2006-11-15 20:27:02 +01:00
joerg@trift2.
5057fa01f4 support-files/mysql.spec.sh : Make the server report its features in the first test run. 2006-11-13 12:10:12 +01:00
joerg@trift2.
ccadac3267 Build the generic RPMs including the "partition" feature. bug#23949 2006-11-13 11:10:27 +01:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
87a9d23487 mysql.spec.sh: 
Aligned test flags to TAR builds
 2006-10-18 12:35:45 +02:00
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
712c4cdbe3 mysql.spec.sh: 
Corrected path to mysql-test directory
  Removed man1/mysql_explain_log.1
 2006-10-12 18:26:17 +02:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -04: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
msvensson@shellback.(none)
91844fb81f Bug#19738 "make install" tries to build files that "make" should already have built 
- Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.
 2006-09-20 09:28:12 +02:00
tnurnberg@salvation.intern.azundris.com
030cbd2f73 Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
 2006-08-24 19:11:51 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
386743c783 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
 2006-08-24 15:12:08 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
 2006-08-24 14:51:54 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
 2006-08-24 14:48:22 +02:00
kent@g4-2.local
510240fb56 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194
 2006-08-22 11:57:37 +02:00
kent@mysql.com/g4-2.local
c8b6563dfc mysql.spec.sh: 
Added ndb_error_reporter to the RPM install (bug#20426)
 2006-08-22 11:55:08 +02:00
kent@mysql.com/g4-2.local
d210c8cfc3 Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194 
into  mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
 2006-08-22 11:52:26 +02:00
kent@mysql.com/g4-2.local
442c111b72 mysql.spec.sh: 
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
 2006-08-22 11:48:58 +02: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
brian@zim.(none)
8d83366bac Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-15 13:53:13 -07:00
joerg@trift2.
71be39fad6 Remove building, packing, and installing the "max" server from the RPM "spec" file. 2006-08-15 20:38:51 +02:00
brian@zim.(none)
af443c2dd8 Fixed warning message breakage. 
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
 2006-08-13 22:28:41 -07:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
patg@govinda.patg.net
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
 2006-08-08 09:01:32 -07:00
kroki/tomash@moonlight.intranet
5c90b6f810 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
 2006-07-29 13:43:34 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588 mysql.spec.sh: 
Man page for "mysqld" command move to section 8 (bug#21220)
 2006-07-28 22:57:57 +02:00
joerg@trift2.
37408ed0f3 Merge trift2.:/M41/tmp_merge 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 15:47:57 +02:00
joerg@trift2.
5ac44f14cb Merge trift2.:/M41/tmp_merge 
into  trift2.:/M50/merge-4.1-to-5.0
 2006-07-24 14:06:17 +02:00
ingo/mydev@chilla.local
8bb8069653 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.1-amerge
 2006-07-24 10:05:17 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2eacb14d2e mysql.spec.sh: 
Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page
 2006-07-19 02:46:48 +02:00
kent@mysql.com/g4-2.local
0f11ea9b0b mysql.spec.sh: 
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
 2006-07-15 00:24:35 +02:00
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
joerg@trift2.
6ec62524b3 support-files/mysql.spec.sh : Fix a typing error. 2006-07-10 12:03:44 +02:00
joerg@mysql.com
dbc1ca22a0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/bug20216-4.1
 2006-07-05 10:42:49 +02:00
joerg@mysql.com
be5f48268c When building RPMs, use the Perl script to run the tests, to automatically check SSL. 2006-07-04 12:30:08 +02:00
kent@mysql.com
593b359d92 mysql.spec.sh: 
Disable old RPM strip
my_global.h:
  Fixed wrong cast, which caused problems with gcc 4.0 and
  floats in prepared statements (Bug #19694)
mysqlmanager.vcproj:
  Place output files in common release/debug directory
 2006-06-30 02:49:28 +02:00
joerg@mysql.com
dcc67c0080 Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). 2006-06-29 11:59:05 +02:00
evgen@moonbone.local
82369c4e65 Manual merge 2006-06-28 19:34:04 +04:00
joerg@mysql.com
0320bae069 Manual merge for bug#20216. 2006-06-27 20:32:08 +02:00
joerg@mysql.com
44653eed3b Revert all previous attempts to call "mysql_upgrade" during RPM upgrade. 
This finishes bug#18516, as far as "generic RPMs" are concerned.
 2006-06-27 20:18:03 +02:00
joerg@mysql.com
3300c79b07 Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0 2006-06-27 20:04:44 +02:00
joerg@mysql.com
f789b87a1b Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216), 
manual merge from 4.0.
 2006-06-27 18:36:41 +02:00
joerg@mysql.com
46ee3ac19d Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216). 2006-06-27 18:17:53 +02:00
evgen@moonbone.local
9a9224da68 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-06-23 14:53:41 +04:00
kent@mysql.com
ef2860e8ff mysql.spec.sh: 
Disable the simplistic auto dependency scan for test/bench (bug#20078)
 2006-06-23 00:37:31 +02:00
joerg@mysql.com
7d83b7e48a Improved fix for bug#18516 (also 19353): 
1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.
 2006-06-22 14:28:05 +02:00
joerg@trift2.
5eea972046 Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1 2006-06-22 12:22:52 +02:00
joerg@mysql.com
27df8b07b7 Fix for bug#18516 (also #19353, reported for 5.1): 
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
 2006-06-20 22:40:46 +02:00
kent@mysql.com
34d82f0bc6 make_win_src_distribution.sh: 
Removed reference to missing "tools" directory
mysql.spec.sh:
  Changed flag --with-yassl => --with-ssl
  Reverted accidental removal of the "make" call :-)
  Configure --with-embedded-server
  Corrected path to "libtool" command
  Corrected path to "libmysqld.a"
  Removed references to "safe_mysqld"
 2006-06-20 12:24:12 +02:00
joerg@mysql.com
950b6c8dfa Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1 2006-06-14 18:28:49 +02:00
joerg@mysql.com
1592670959 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0 2006-06-14 18:25:09 +02:00
joerg@trift2.
075bb7faf2 Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 2006-06-14 18:16:35 +02:00
joerg@mysql.com
6448fca67a Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 2006-06-14 18:13:36 +02:00
joerg@mysql.com
054cc44ede support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 2006-06-14 16:54:54 +02:00
brian@zim.(none)
ca63edc88b Removing mysql_explain_log from 5.1 2006-05-23 17:26:56 -07:00
anozdrin@mysql.com
4a43bd1a3a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-22 14:22:58 +04:00
kent@mysql.com
49a8f9ee29 Merge 2006-05-21 10:38:59 +02:00
kent@mysql.com
0a778b4ce0 Merge 2006-05-21 00:47:08 +02:00
kent@mysql.com
2419732379 Merge 2006-05-20 23:36:17 +02:00
kent@mysql.com
e09910f91f mysql.spec.sh: 
Always compile position independent
 2006-05-20 22:47:20 +02:00
anozdrin@mysql.com
c1113af15c This is an implementation of two WL items: 
- WL#3158: IM: Instance configuration extensions;
  - WL#3159: IM: --bootstrap and --start-default-instance modes

The following new statements have been added:
  - CREATE INSTANCE;
  - DROP INSTANCE;

The behaviour of the following statements have been changed:
  - SET;
  - UNSET;
  - FLUSH INSTANCES;
  - SHOW INSTANCES;
  - SHOW INSTANCE OPTIONS;
 2006-05-18 18:57:50 +04:00
kent@mysql.com
d48e55eefd Merge 2006-05-17 23:41:56 +02:00
kent@mysql.com
9fca0d766b mysql.spec.sh: 
Removed Berkeley DB
configure.in:
  Adjusted Netware support
basic.t.c:
  Change for Netware
Makefile.am:
  Use thread safe libmysqlclient_r if it was built
valgrind.supp:
  Hide report about strlen/_dl_init_paths
ha_tina.cc:
  Temporarely disable CSV engine on Netware,
  as the engine depends on mmap()
net_serv.cc:
  Include <sys/select.h> for Netware
 2006-05-16 22:47:22 +02:00
tomas@poseidon.ndb.mysql.com
b592d872ec Merge jonas@perch:src/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2006-05-16 11:31:10 +02:00
tomas@poseidon.ndb.mysql.com
9e883ac3d7 Merge jonas@perch:src/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-05-16 11:05:50 +02:00
kent@mysql.com
a31d16abe8 Merge mysql.com:/data0/mysqldev/my/tmp_merge 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-new
 2006-05-16 01:59:09 +02:00
kent@mysql.com
9a93dce158 Merge 2006-05-10 22:15:08 +02:00
kent@mysql.com
237f4a37d8 mysql.spec.sh: 
Compile in all character sets in Max (bug#14918)
 2006-05-10 21:53:01 +02:00
jonas@perch.ndb.mysql.com
fddbcb2bf8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-05-08 07:56:26 +02:00
jonas@perch.ndb.mysql.com
a5fc03387a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
 2006-05-08 07:48:08 +02:00
tomas@poseidon.ndb.mysql.com
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
kent@mysql.com
b050f975c4 Merge 2006-05-02 02:45:04 +02:00
kent@mysql.com
e8fb05845b Merge 2006-05-01 20:16:19 +02:00
kent@mysql.com
f45d6d3cc6 mysql.spec.sh: 
Use "./libtool --mode=execute" to find real path to executables
 2006-05-01 19:48:31 +02:00
jimw@mysql.com
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
kent@mysql.com
b714a0cec4 mysql.spec.sh: 
Backport of changes in 5.0 (bug#18294)
 2006-04-29 01:28:04 +02:00
kent@mysql.com
50e8ba04cf mysql.spec.sh: 
Include and run mysql_upgrade if needed (bug#19353)
 2006-04-28 17:03:11 +02:00
jonas@perch.ndb.mysql.com
ec6d198ea0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-26 16:57:43 +02:00
jonas@perch.ndb.mysql.com
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
jonas@perch.ndb.mysql.com
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
jonas@perch.ndb.mysql.com
a8f407a7ef Add ndb_config to rpm spec 2006-04-26 14:54:20 +02:00
jimw@mysql.com
b047dbbb1d Remove ancient version of Debian packaging files. 2006-04-13 17:18:43 -07:00
jimw@mysql.com
4cfc378096 Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping 2006-04-13 13:10:00 -07:00
jimw@mysql.com
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
jimw@mysql.com
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
hartmut@mysql.com
4a4c459fa3 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2006-04-07 11:23:55 +02:00
igreenhoe@mysql.com
84bfed689d Fix for Bug #16240 2006-04-06 10:13:46 -07:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
kent@mysql.com
5e28df35af Merge 2006-04-01 05:53:37 +02:00
kent@mysql.com
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
kent@mysql.com
b1dfda9b7f mysql.spec.sh: 
Changed product name from "Community Edition" to "Community Server", bug#17970
 2006-03-07 18:53:26 +01:00
kent@mysql.com
16933400fc mysql.spec.sh: 
Enabled fast mutexes, now default is off
 2006-03-06 14:57:41 +01:00
kent@mysql.com
ab77867efb Merge 2006-03-06 13:50:52 +01:00
kent@mysql.com
2ffb679a27 mysql.spec.sh: 
Use installed libz.a to avoid hard to solve static linking problems
 2006-03-03 20:30:28 +01:00
kent@mysql.com
7ae10acbc4 mysql.spec.sh: 
Don't create empty embedded RPM, bug#15769
 2006-03-03 03:27:27 +01:00
bpontz@mysql.com
2e82e5aef8 Fix the changelog entry header, format was wrong 2006-02-21 15:39:43 -05:00
kent@mysql.com
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
kent@mysql.com
088bc804aa mysql.spec.sh: 
Only install a subset of shared libraries created
 2006-02-17 16:38:32 +01:00
joerg@mysql.com
868b1678e7 support-files/mysql.spec.sh : Use "-i" on "make test-force", add missing changelog notes. 2006-02-13 19:07:40 +01:00
joerg@mysql.com
47746b12c4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/rpmspec-5.0
 2006-02-13 18:04:30 +01:00
kent@mysql.com
eb9683442d Merge 2006-02-12 20:45:03 +01:00
joerg@mysql.com
49caf76e59 support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog. 2006-02-10 18:07:14 +01:00
joerg@mysql.com
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
kent@mysql.com
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
knielsen@mysql.com
920ac3a094 Modified RPM spec to match new 5.1 debug+max combined community packaging. 2006-02-08 11:42:17 +01:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 23:27:06 +03:00
joerg@mysql.com
166c9f8405 Update the spec file for the shared compat RPM with version info. 2006-01-19 10:44:44 +01:00
kent@mysql.com
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
rparranovo@mysql.com
0a836ee845 Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/novo/MySQL/mysql-5.1
 2005-12-15 00:40:07 -03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-14 09:42:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3069276592 Datadir variable should not be reset, if it was 
set in this script.
 2005-12-14 02:01:54 +02:00
aivanov@mysql.com
645805385d Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
 2005-12-13 23:56:22 +03:00
rparranovo@mysql.com
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
rparranovo@mysql.com
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
joerg@mysql.com
2eb0e9a43c Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2005-12-05 19:00:00 +01:00
joerg@mysql.com
b9451ee51f Merge from 4.1, partly manual. 2005-12-05 18:33:48 +01:00
joerg@mysql.com
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
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
joerg@mysql.com
205c6fc1e9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-11-23 09:38:12 +01:00
joerg@mysql.com
9b0bfb8858 Manual merge from 4.1 (bug#15145). 2005-11-22 20:30:45 +01:00
joerg@mysql.com
511fbac4df Manual merge from 4.1, bug#15145. 2005-11-22 20:15:54 +01:00
joerg@mysql.com
c735d07dec support-files/mysql.spec.sh 
Fix a possible problem on RPM un-install. bug#15145
 2005-11-22 19:58:58 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
guilhem@mysql.com
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
joerg@mysql.com
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
jimw@mysql.com
eeaecbc2bd Sync suggestions for bdb_cache_size in my-medium.cnf and my-huge.cnf to 
be the same as the suggested innodb_buffer_pool_size.
 2005-11-11 11:41:23 -08:00
petr@mysql.com
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
kent@mysql.com
58dd64612c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-07 13:39:03 +01:00
kent@mysql.com
79aaf0754d mysql.spec.sh: 
Always use bundled zlib
 2005-11-05 01:44:35 +01:00
monty@mysql.com
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
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
lenz@mysql.com
f2eeaca387 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
 2005-11-01 17:46:00 +01:00
lenz@mysql.com
72343cef75 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
 2005-11-01 17:39:09 +01:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
 2005-10-31 11:54:36 +02:00
jimw@mysql.com
27685c0c47 Merge mysql.com:/home/jimw/my/mysql-4.1-13811 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-28 18:43:52 -07:00
lenz@mysql.com
7decf21c02 - after merge fix: removed pack_isam from the RPM spec file list again 2005-10-28 16:50:52 +02:00
lenz@mysql.com
303ba37044 - added man page for the mysqlmanager in the RPM spec file list 2005-10-28 13:31:19 +02:00
lenz@mysql.com
8303ca007a - after merge fixes 2005-10-28 11:10:29 +02:00
lenz@mysql.com
0f3192323c - fixed RPM spec file list after merge, removed dupes 2005-10-28 10:46:07 +02:00
lenz@mysql.com
92266c95de Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0 
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
 2005-10-27 18:34:20 +02:00
mysqldev@mysql.com
b3263c032e - cleanup: removed the empty NEW-RPMS directory and all references 
- cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
   script (we now use Do-pkg for building OS X packages)
 2005-10-27 18:32:14 +02:00
lenz@mysql.com
6b123044d0 - after merge fixes 2005-10-27 16:53:14 +02:00