mskold/marty@linux.site
b767f1a02c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-12 16:35:41 +02:00
mskold/marty@mysql.com/linux.site
4f30db1f26
Bug #21378 Alter table from X storage engine to NDB could cause data loss: don't overwrite local tables when pushing out schema changes
2006-09-12 16:34:12 +02:00
rburnett@production.mysql.com
db89fb33aa
log.cc:
...
Fixing failed merge
2006-09-12 04:46:41 +02:00
rburnett@bk-internal.mysql.com
cf1a0b3250
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-09-11 16:43:56 +02:00
serg@janus.mylan
28b90bfab5
bugfix
2006-09-09 10:39:12 +02:00
serg@janus.mylan
62b5c384df
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch
2006-09-09 10:27:12 +02:00
brian@zim.(none)
aa52207c11
Warning fixes for Windows, and an include fix for Windows for Innodb.
2006-09-07 16:17:16 -07:00
brian@zim.(none)
0668eee261
Add support for Falcon, so that partitioning can be tested.
2006-09-07 12:35:52 -07:00
brian@zim.(none)
7cc71499db
Fix for a compile problem in Windows.
2006-09-07 12:34:12 -07:00
brian@zim.(none)
80a8f2c12b
Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning.
2006-09-07 12:12:52 -07:00
brian@zim.(none)
a80a8ecd85
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-07 08:49:33 -07:00
brian@zim.(none)
5e46ea7f03
Moves Innodb handler to the Innodb storage directory.
2006-09-07 08:23:58 -07:00
serg@janus.mylan
a057d38514
cleanup of pligin removal code
...
fixed multiple and missing deinitializations, moved all
deinit/del code in one place
2006-09-07 15:01:36 +02:00
serg@janus.mylan
e1db08e1da
minor plugin api fixes:
...
remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version
2006-09-07 12:56:32 +02:00
arjen@mysql.com/albus.bitbike.com
f5cebbdfba
errmsg.txt:
...
Update of Dutch errmsg translations (not complete yet)
errmsg.h:
Fixup of changed error message file path in comment
authors.h:
Ego add.
2006-09-07 13:52:30 +10:00
rburnett@bk-internal.mysql.com
e70867872b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-09-07 04:48:29 +02:00
rburnett@production.mysql.com
926d98d973
Merge production.mysql.com:/usersnfs/rburnett/tmp_merge2
...
into production.mysql.com:/usersnfs/rburnett/mysql-5.1
2006-09-06 18:27:26 +02:00
brian@zim.(none)
1ac47c9513
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/merge-5.1
2006-09-06 09:23:47 -07:00
mskold/marty@linux.site
b921b1288e
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-06 11:55:16 +02:00
mskold/marty@mysql.com/linux.site
70b19dd1c0
Bug #21056 ndb pushdown equal/setValue error on datetime: Added missing order by
2006-09-06 11:54:01 +02:00
mskold/marty@linux.site
d33411e558
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-06 11:21:49 +02:00
serg@janus.mylan
fa98e9c718
converting plugin states to bitmask to simplify testing.
...
state_mask argument to plugin_foreach()
2006-09-06 10:22:59 +02:00
jonas@perch.ndb.mysql.com
e51935b363
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-06 02:16:36 +02:00
serg@janus.mylan
29acac81cf
plugin_foreach - don't hold the lock when calling the function
2006-09-05 23:59:16 +02:00
mskold/marty@mysql.com/linux.site
6752861d1b
Bug #21056 ndb pushdown equal/setValue error on datetime: only pushdown like of string type fields
2006-09-05 17:07:00 +02:00
mskold/marty@linux.site
67b6896aaa
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-04 16:12:36 +02:00
jonas@perch.ndb.mysql.com
81b2d8ac43
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-04 14:29:28 +02:00
jonas@perch.ndb.mysql.com
0b65cbaf5f
bug#21965
...
merge to 5.1 - yet another merge fix
2006-09-04 14:26:18 +02:00
jonas@perch.ndb.mysql.com
724aeb81c2
bug#21965
...
merge to 5.1
2006-09-04 14:19:39 +02:00
jonas@perch.ndb.mysql.com
f4392a98eb
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-09-04 14:08:15 +02:00
jonas@perch.ndb.mysql.com
7ff631e890
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-09-04 13:46:56 +02:00
jonas@perch.ndb.mysql.com
96ff8b4c52
bug#21965 - replication
...
fix deadlock if master switches log file in parallell with "show master logs"
2006-09-04 13:43:34 +02:00
jonas@perch.ndb.mysql.com
81f9676de6
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-03 17:55:01 +02:00
jonas@perch.ndb.mysql.com
16a32bc211
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-03 11:31:51 +02:00
jonas@perch.ndb.mysql.com
5a78db3ddc
ndb -
...
fix ndb-violations of strict aliasing found by gcc4.1
(crashes in ndb_dd_*)
2006-09-03 11:11:37 +02:00
jonas@perch.ndb.mysql.com
6d715dead0
ndb -
...
gcc-4.1.1 work-around for bug in strict-aliasing
2006-09-03 10:57:34 +02:00
pekka@orca.ndb.mysql.com
454d545473
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-09-02 05:23:04 +02:00
mskold/marty@mysql.com/linux.site
ccd3e89525
Added missing return
2006-09-01 20:56:34 +02:00
anozdrin/alik@alik.
faad252336
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1-tree
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2006-09-01 22:24:51 +04:00
brian@zim.(none)
c7baf60267
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-09-01 09:19:10 -07:00
mskold/marty@linux.site
712f1f3da4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 16:16:49 +02:00
mskold/marty@mysql.com/linux.site
166580275c
Removed absolute path
2006-09-01 16:14:59 +02:00
mskold/marty@linux.site
04a62eb684
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39
Fixed ndbapi-examples, and added tests for mysql-test-run.pl
2006-09-01 15:14:50 +02:00
evgen@moonbone.local
e1c245bff3
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
...
into moonbone.local:/work/tmp_merge-5.1-mysql
2006-09-01 14:08:38 +04:00
mikael/pappa@dator5.(none)
636d902305
Removed Windows from tests since bug#19107 is known to hang test
2006-09-01 02:12:30 -04:00
brian@zim.(none)
b5fdcc2962
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-08-31 16:11:57 -07:00
mikael/pappa@dator5.(none)
35304be521
Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb
...
into dator5.(none):/home/pappa/push_clone
2006-08-31 16:45:46 -04:00
brian@zim.(none)
422ab2973b
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-08-31 13:42:46 -07:00
mikael/pappa@dator5.(none)
a4e0289c96
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/push_clone
2006-08-31 16:23:26 -04:00