Commit graph

483 commits

Author SHA1 Message Date
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@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