Commit graph

486 commits

Author SHA1 Message Date
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
lenz@mysql.com
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
kent@mysql.com
e3c4993bf3 mysql.spec.sh:
Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00
kent@mysql.com
8bccfab21f mysql.spec.sh:
Enabled yaSSL
mysql-test-run.pl:
  Increased test case timeout from 15 min
2005-10-19 02:53:03 +02:00
kent@mysql.com
dcd4b9923a mysql.spec.sh:
Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0
2005-10-15 01:40:28 +02:00
kent@mysql.com
4ea2aacb2a mysql.spec.sh:
For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree
2005-10-14 22:49:53 +02:00
kent@mysql.com
5035abf052 mysql.spec.sh:
Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"
2005-10-14 22:11:52 +02:00
lenz@mysql.com
89e10f34c3 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-10-13 22:16:24 +02:00
lenz@mysql.com
c93927eef0 - added a usermod call in the postinstall section of the RPM spec file
to assign a potential existing mysql user to the correct user group (BUG#12823)
2005-10-13 22:10:54 +02:00
lenz@mysql.com
a315d1be76 RPM spec file fixes:
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.
2005-10-13 22:01:02 +02:00
jimw@mysql.com
8f659d05a2 Fix typo (thread_cache should be thread_cache_size) in example
configuration files. (Bug #13811)
2005-10-13 11:05:59 -07:00
ndbdev@dl145b.mysql.com
147e22650e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-10-10 17:15:25 +02:00
lenz@mysql.com
0b80982497 - typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file 2005-10-10 13:00:41 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
lenz@mysql.com
54d60d7fa7 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-09-29 14:35:07 +02:00
lenz@mysql.com
68e6b0e21d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-09-29 13:57:41 +02:00