msvensson@shellback.(none)
a163faf0d3
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
...
into shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219
2006-08-16 15:29:58 +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
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
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@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
mskold/marty@mysql.com/linux.site
697b89cd54
bug #18184 SELECT ... FOR UPDATE does not work..: Updated test result file
2006-08-15 15:49:31 +02:00
mskold/marty@linux.site
604f3f8a69
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-08-15 14:39:48 +02:00
mskold/marty@mysql.com/linux.site
c8b93da355
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range
2006-08-15 14:31:21 +02:00
mskold/marty@mysql.com/linux.site
66e8255491
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0
ndb_lock.test, ndb_lock.result:
...
bug #18184 SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
2006-08-15 13:12:27 +02:00
mskold/marty@linux.site
ed6deb3d88
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-08-15 11:49:04 +02:00
brian@zim.(none)
deb37d146e
Period removal for warning message.
2006-08-15 01:20:34 -07:00
mskold/marty@mysql.com/linux.site
b0510b2c6c
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 09:40:37 +02:00
mskold/marty@mysql.com/linux.site
2d16aa5796
ndb_lock.test, ndb_lock.result:
...
bug #18184 SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
2006-08-15 09:38:21 +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)
16a5d97a5d
Merge fixes
2006-08-14 16:50:52 -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
brian@zim.(none)
545029df36
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 14:47:50 -07:00
brian@zim.(none)
4d7f7fb878
Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB.
2006-08-14 14:45:48 -07:00
kostja@bodhi.local
1f80fb0453
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-14 22:38:22 +04: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)
c43a332859
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/dep-5.0
2006-08-14 09:45:41 -07:00
kostja@bodhi.local
d03b39aaab
Fix a test case (proper clean up).
2006-08-14 19:18:33 +04:00
kostja@bodhi.local
14e237a957
Fix a test suite failure.
2006-08-14 19:05:35 +04:00
svoj@may.pils.ru
91e94d781f
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
2006-08-14 18:08:33 +05:00
kostja@bodhi.local
9b05865be4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-14 16:30:57 +04:00
kostja@bodhi.local
d4a7b82be9
Windows build fix: declare _db_set_ before it's used.
2006-08-14 16:15:08 +04:00
svoj@may.pils.ru
d4bdba176f
BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1
...
Fixed by moving update_key_parts() down to be after write_index().
2006-08-14 17:05:02 +05:00
mats@romeo.(none)
7a1ccf90d4
Merge romeo.(none):/home/bkroot/mysql-5.1-new-maint
...
into romeo.(none):/home/bk/mytap-mysql-5.1-new-maint
2006-08-14 14:04:30 +02:00
mats@romeo.(none)
2c21e455d4
Fixing unit test execution script to work with AIX 5.2 and OS X machines.
...
These are using old version of the Test::Harness modules, so I resort
to a safer way of running executable files.
2006-08-14 13:52:05 +02:00
brian@zim.(none)
7429c871b9
Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing.
2006-08-14 03:29:17 -07:00
brian@zim.(none)
b93a5c5f04
Updated row result, and fix for Windows build.
2006-08-14 03:26:53 -07:00
kostja@bodhi.local
5dfdc8bfce
Manual merge 5.0->5.1. Post-merge fixes.
2006-08-14 13:27:11 +04: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
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00
baker/brian@zim.(none)
a06a582212
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-11 13:30:55 -07:00
jimw@rama.(none)
2e87907e40
Merge rama.(none):/home/jimw/my/mysql-5.0-21284
...
into rama.(none):/home/jimw/my/mysql-5.1-clean
2006-08-11 12:19:41 -07:00
cmiller@zippy.cornsilk.net
1257062ef4
German translations.
2006-08-11 09:27:44 -04:00
svoj@may.pils.ru
07a1ed651f
Extended a test case for bug#7391.
2006-08-11 14:41:07 +05:00
svoj@may.pils.ru
827164916c
Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0
2006-08-11 14:24:09 +05:00
baker/brian@zim.(none)
5a466cc48c
Removed bdb test cases.
2006-08-10 18:29:25 -07:00
pgalbraith/patg@govinda.patg.net
b2ce951b81
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
2006-08-10 15:31:44 -07:00
patg@govinda.patg.net
4371749996
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
2006-08-10 14:28:39 -07:00
brian@zim.(none)
e8289bfbc1
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-10 13:44:04 -07:00
cmiller@zippy.cornsilk.net
f6f7eb851e
Merge updates.
2006-08-10 12:39:18 -04:00
kroki/tomash@moonlight.intranet
b341356abd
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
2006-08-10 16:16:16 +04:00
kroki/tomash@moonlight.intranet
aca2c3761a
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 16:11:55 +04:00
kroki/tomash@moonlight.intranet
ed42379c72
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-10 15:07:27 +04:00
serg@janus.mylan
069131e28a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into janus.mylan:/usr/home/serg/Abk/m51
2006-08-10 12:39:59 +02:00