cmiller@zippy.cornsilk.net
|
d170f1b124
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-08-21 16:59:53 -04:00 |
|
rburnett@bk-internal.mysql.com
|
f98b21b732
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-21 20:27:32 +02:00 |
|
cmiller@zippy.cornsilk.net
|
f2f90320de
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-08-21 12:59:46 -04:00 |
|
cmiller@zippy.cornsilk.net
|
ff57b304a4
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-08-21 12:55:43 -04:00 |
|
joerg@trift2.
|
47d6296bc7
|
mysql-test/mysql-test-run.pl : Use fixed path names for all NDB binaries,
because searching for them makes the script abort with all non-NDB builds.
|
2006-08-21 16:19:29 +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 |
|
rburnett@bk-internal.mysql.com
|
e37e0786fc
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-21 14:38:58 +02:00 |
|
jpipes@shakedown.(none)
|
56443ae201
|
Fix for bug #21642: "configure" with no arguments does not build
|
2006-08-20 17:24:48 -04:00 |
|
holyfoot/hf@mysql.com/deer.(none)
|
cf76884b38
|
Fix for the failing gis.test
|
2006-08-18 22:29:35 +05:00 |
|
joerg@trift2.
|
1f79db41fa
|
mysql-test-run.pl : Fix the search path for "ndb_mgmd" and "ndbd". bug#21721
|
2006-08-18 18:24:38 +02:00 |
|
rburnett@bk-internal.mysql.com
|
d094b5f2f5
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-18 15:46:41 +02:00 |
|
rburnett@bk-internal.mysql.com
|
4b7e3775be
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-17 22:30:32 +02:00 |
|
rburnett@production.mysql.com
|
284fa931bb
|
A couple of adjustments to the merge to fix the broken build
instance.cc:
Removed wrongly placed closing brace
item_geofunc.cc:
needed to pass in a TABLE_SHARE* instead of a TABLE*
|
2006-08-17 22:24:35 +02:00 |
|
rburnett@bk-internal.mysql.com
|
9d531c4f43
|
rename to avoid case sensitive collision
|
2006-08-17 18:50:58 +02:00 |
|
rburnett@bk-internal.mysql.com
|
d65095b451
|
Merge bk-internal.mysql.com:/data0/bk/tmp_reg
into bk-internal.mysql.com:/data0/bk/mysql-5.1
|
2006-08-17 17:19:41 +02:00 |
|
cmiller@zippy.cornsilk.net
|
64092ca93b
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:55:57 -04:00 |
|
cmiller@zippy.cornsilk.net
|
6998c5140b
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:53:12 -04:00 |
|
cmiller@zippy.cornsilk.net
|
7d38d61398
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:49:56 -04:00 |
|
cmiller@zippy.cornsilk.net
|
030ddb48f3
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:47:23 -04:00 |
|
cmiller@zippy.cornsilk.net
|
c627a6ce84
|
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
|
2006-08-17 10:42:50 -04:00 |
|
rburnett@bk-internal.mysql.com
|
1bfe766869
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-17 16:37:16 +02:00 |
|
pgalbraith/patg@govinda.patg.net
|
dd1d46c2cd
|
merge warning test results (!)
|
2006-08-16 20:39:33 -07:00 |
|
pgalbraith/patg@govinda.patg.net
|
ceb7cb55e7
|
test result changes (non-functional) for 5.1-5.0 merge
|
2006-08-16 17:16:36 -07:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
00ab7be7b9
|
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
|
2006-08-16 19:31:33 -04:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
af844dbed6
|
manual merge
|
2006-08-16 19:19:49 -04:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
ca6532af50
|
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
|
2006-08-16 16:16:10 -04:00 |
|
iggy@rolltop.ignatz42.dyndns.org
|
a86f035a08
|
Bug#20328 - Correction to test/result for broken Windows build.
|
2006-08-16 13:55:16 -04:00 |
|
pgalbraith/patg@govinda.patg.net
|
370f22418b
|
merge 5.0 -> 5.1, re-enabling federated, disabled partition
|
2006-08-16 10:47:53 -07:00 |
|
patg@govinda.patg.net
|
b56ff54805
|
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
|
2006-08-16 10:05:24 -07:00 |
|
patg@govinda.patg.net
|
79ad722e39
|
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
|
2006-08-16 10:03:24 -07:00 |
|
rburnett@bk-internal.mysql.com
|
38a36da86d
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
|
2006-08-16 17:47:20 +02:00 |
|
reggie@big_geek.
|
55165b2f55
|
small fix to enable the test suite to find executables and scripts on Windows
|
2006-08-16 10:19:48 -05:00 |
|
msvensson@shellback.(none)
|
da60a5194c
|
Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-08-16 17:14:40 +02:00 |
|
gluh@gluh.(none)
|
92aa3baef3
|
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
|
2006-08-16 20:09:16 +05:00 |
|
gluh@mysql.com/gluh.(none)
|
a9b18171ec
|
Bug#20871 Partitions: crash if --skip-innodb
return error if engine is disabled
|
2006-08-16 20:07:12 +05:00 |
|
msvensson@shellback.(none)
|
98eaa07600
|
Bug#20328 mysql client: dumb about trailing spaces on 'help' command
Fix testcase to also work on windows
|
2006-08-16 17:03:41 +02:00 |
|
rburnett@bk-internal.mysql.com
|
8baecf7ed6
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
|
2006-08-16 16:04:10 +02:00 |
|
rburnett@bk-internal.mysql.com
|
f23643cc54
|
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
|
2006-08-16 15:58:25 +02:00 |
|
msvensson@shellback.(none)
|
27a4154631
|
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-08-16 15:52:52 +02:00 |
|
msvensson@shellback.(none)
|
b963293595
|
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
|
2006-08-16 15:50:50 +02:00 |
|
msvensson@shellback.(none)
|
ba1ac55acf
|
Bug#20219 make bin-dist produces unportable for testing tarball
- Setup LD_LIBRARY_PATH to favor local libs
|
2006-08-16 15:25:30 +02:00 |
|
holyfoot/hf@mysql.com/deer.(none)
|
c965eea789
|
Merge bk@192.168.21.1:mysql-5.0-kt
into mysql.com:/home/hf/work/mysql-5.0.20910
|
2006-08-16 09:57:05 +05:00 |
|
brian@zim.(none)
|
183f028633
|
Cheery picked Antony's patch to allow for Window's builds in 5.1
|
2006-08-15 21:49:26 -07:00 |
|
ramil/rkalimullin@production.mysql.com
|
4ef5116425
|
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
|
2006-08-16 06:37:39 +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 |
|
mskold/marty@mysql.com/linux.site
|
36042d81e4
|
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
|
2006-08-15 22:18:41 +02:00 |
|
mskold/marty@linux.site
|
5c748565dc
|
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
|
2006-08-15 22:15:51 +02: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 |
|
acurtis/antony@xiphis.org/ltantony.xiphis.org
|
711b592701
|
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/opt2/tmp/autopush/mysql-5.0-fixbuild
|
2006-08-15 10:31:39 -07:00 |
|
pgalbraith/patg@govinda.patg.net
|
67513cafa5
|
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
|
2006-08-15 09:02:53 -07:00 |
|