brian@zim.(none)
f68ce0ddef
This changeset moves the ha_myisam files to their storage directories. It also includes updates for all engines include patch for windows builds.
2006-08-19 17:38:42 -07:00
brian@zim.(none)
800e348740
Update to push all of merge into the merge storage directory.
2006-08-19 10:23:22 -07:00
brian@zim.(none)
849fac1496
Moved heap into its own directory.
2006-08-19 08:02:52 -07:00
brian@zim.(none)
3d09079e31
Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.
2006-08-18 21:19:19 -07: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@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
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
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
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
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
rburnett@bk-internal.mysql.com
8d5e2dd644
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
2006-08-15 17:02:08 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b65bf3b4da
Merge mysql.com:/usr/home/ram/work/tmp_merge
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-08-15 19:41:23 +05:00
mskold/marty@mysql.com/linux.site
3b42e84c44
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-08-15 15:57:36 +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
holyfoot/hf@mysql.com/deer.(none)
81764f89cf
Merge bk@192.168.21.1:mysql-5.0-kt
...
into mysql.com:/home/hf/work/mysql-5.0.20910
2006-08-15 18:15:12 +05: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
acurtis/antony@xiphis.org/ltantony.xiphis.org
4c57a94b78
fix windows build
2006-08-15 01:54:14 -07: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
bar@mysql.com/bar.intranet.mysql.r18.ru
9f6c76eb20
Merge mysql.com:/usr/home/bar/mysql-4.1.b19741
...
into mysql.com:/usr/home/bar/mysql-5.0.b19741merge
2006-08-15 12:04:51 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-merge
2006-08-14 21:27:36 -07: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
rburnett@production.mysql.com
0199dda5a6
My previous change of replacing the call to sprintf with some memcpy type routines was not correct. This patch reverts that.
...
mysql_client_test.c:
reverting my previous change
2006-08-14 20:48:37 +02: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