cmiller@zippy.cornsilk.net
895bf0555b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-15 11:25:02 -04:00
hartmut@mysql.com/linux.site
871eeadc94
Add SSL specific linker flags to --libmysqld-libs (Bug #21239 )
2006-09-15 16:35:50 +02:00
georg@lmy002.wdf.sap.corp
66133b7f74
included make_win_bin_dist (required for pushbuild) into distribution (make dist)
2006-09-01 16:55:35 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac
Fixes for crashes and test failures
2006-09-01 14:34:37 +02:00
brian@zim.(none)
41f920b013
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
brian@zim.(none)
8deb5beb9c
Merge zim.(none):/home/brian/mysql/dep-5.0
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-08-14 15:24:29 -07:00
joerg@trift2.
a560c3ee1f
scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages.
2006-08-14 19:56:41 +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
cmiller@zippy.cornsilk.net
543fcde9b9
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0
2006-08-09 22:23:41 -04: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
cmiller@zippy.cornsilk.net
dd5eeaf676
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/m41-maint--07OBQ
2006-08-02 14:57:12 -04:00
evgen@moonbone.local
7f0a080660
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-08-02 16:46:55 +04:00
msvensson@neptunus.(none)
f1a262bcd5
Merge bk-internal:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-07-31 16:07:28 +02: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
jimw@rama.(none)
f7e19b40f3
Merge rama.(none):/home/jimw/my/tmp_merge
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07: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
c188a3bf0a
make_binary_distribution.sh:
...
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 23:06:49 +02:00
msvensson@neptunus.(none)
d89f177377
Bug#21125 mysqldump: Problem with non-standard table names
...
- The mysql-test/std_data/bug15328.cnf file was not copied to install or dist dir.
2006-07-24 14:31:37 +02:00
evgen@moonbone.local
b7a55b9b5c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 23:45:17 +04:00
igor@rurik.mysql.com
6e75a11b01
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-07-14 14:45:23 -07:00
iggy@rolltop.ignatz42.dyndns.org
bd791a15ae
Bug #20721 : mysql_install_db first line is blank.
...
Minor script changes for uniformity.
2006-07-14 15:22:16 -04:00
cmiller@zippy.(none)
87dd9b978c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-13 11:12:41 -04:00
cmiller@zippy.(none)
2c5308a703
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-13 11:11:20 -04:00
iggy@rolltop.ignatz42.dyndns.org
d3eab1ca35
Bug #19779 : mysql_explain_log documentation is outdated.
2006-07-13 10:48:34 -04:00
joerg@trift2.
dcf85ebec4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/M51/bug20216-5.1
2006-07-06 17:58:31 +02:00
joerg@trift2.
1746d41862
Merge mysql.com:/M50/tmp_merge_kent into mysql.com:/M51/merge-kent-5.1
2006-07-05 16:30:13 +02:00
igor@rurik.mysql.com
ce57588434
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-07-01 15:31:28 -07:00
knielsen@rt.int.sifira.dk
dcd9132fe7
Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist
...
into mysql.com:/usr/local/mysql/tmp-5.1
2006-06-30 15:21:45 +02:00
knielsen@mysql.com
5b1c92244c
Add a script scripts/make_win_bin_dist, used to generate a Windows
...
binary disctribution for Falcon.
2006-06-30 15:15:20 +02:00
elliot@mysql.com
68db32613b
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2006-06-30 00:14:25 -04:00
cmiller@zippy.(none)
244bdc96c3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
2006-06-29 13:49:40 -04: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
igreenhoe@mysql.com
1d8e1ba3a6
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/greenman/workspace-mysql/mysql/pending/bug-5.0-17353
2006-06-28 08:32:41 -07:00
iggy@mysql.com
578fee6990
Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter
2006-06-27 18:07:23 -04:00
joerg@mysql.com
d6038ede17
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/autopush20216-5.0
2006-06-27 22:45:21 +02:00
kent@mysql.com
b1d3bd5a7a
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-27 00:13:45 +02:00
kent@mysql.com
748b287cad
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-06-26 23:47:14 +02:00
kent@mysql.com
c36dd28676
make_sharedlib_distribution.sh:
...
For compatibility, don't use {..,..} in pattern matching
make_binary_distribution.sh:
Added .dylib and .sl as shared library extensions
2006-06-26 23:44:17 +02:00
kent@mysql.com
b6e89c2b1e
.del-make_win_src_distribution.sh~f80d8fca44e4e5f1:
...
Delete: scripts/make_win_src_distribution.sh
Makefile.am:
Unix and Windows now shares source package
2006-06-25 10:25:00 +02:00
igor@rurik.mysql.com
b5bdc178af
Fixed some dsp files.
...
Fixed make_win_src_distribution.sh to return back dsp files
for yassl.
2006-06-23 18:21:34 -07:00
joerg@mysql.com
671a1be31b
The binary "mysql_upgrade" must be included in the distribution. (bug#18516 + 19353)
2006-06-23 12:17:11 +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
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
kent@mysql.com
8f0aa436ed
Merge
2006-06-20 11:11:18 +02:00
kent@mysql.com
cae47f4b20
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 11:38:16 +02:00
kent@mysql.com
6783fc830f
make_win_src_distribution.sh:
...
Make output less verbose
Make temporary directory name unique
Remove temporary directory on interrupt
2006-06-17 11:33:34 +02:00
kent@mysql.com
1b7d4cacfb
make_win_src_distribution.sh:
...
Don't try copy non existing extra/{sql_state,mysqld_error}.h
2006-06-17 10:44:52 +02:00
kent@mysql.com
10833287ef
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-06-17 03:13:22 +02:00
kent@mysql.com
eadd351031
make_win_src_distribution.sh:
...
Include "sql_yacc.yy" for completeness (bug#20387)
2006-06-17 03:04:43 +02:00
igor@rurik.mysql.com
70ee1c2c6e
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:23:59 -07:00