lars/lthalmann@dl145k.mysql.com
a1c70022f2
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 17:14:40 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
6ad198e997
Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments)
2006-09-11 14:45:40 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2da55c05e2
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-11 13:50:41 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-09-11 13:34:44 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
4c467cc438
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-11 13:17:51 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
8c64ce171a
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-11 11:25:55 +02:00
mats@romeo.(none)
f480cb0d67
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
2006-09-11 10:22:04 +02:00
mats@romeo.(none)
f513461030
WL#3259 (More columns on slave than on master):
...
Adding files to CMakeLists.txt
2006-09-11 10:19:11 +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
mats@romeo.(none)
24205eb8ba
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-09-08 11:55:54 +02:00
mats@romeo.(none)
26c831f75d
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl
2006-09-08 11:41:19 +02:00
mats@romeo.(none)
090e020921
Patches to fix problems on Windows
2006-09-08 10:20:14 +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
guilhem@gbichot3.local
87de41ad23
Removing sleeps; rpl_row_basic_8partition falls from 2 minutes
...
15 seconds to less than a second.
The sleeps used to be necessary but not anymore as NDB has been fixed
wrt sync_slave_with_master.
2006-09-07 18:01:42 +02: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
mats@romeo.(none)
eea3e3d6b1
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b17620-mysql-5.1-new-rpl
2006-09-06 19:34:02 +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
mats@romeo.(none)
6ba388d17c
BUG#17620: Row-based replication fails when query cache enabled on slave
...
Invalidating query cache when processing rows for a statement on the slave.
2006-09-06 17:45:27 +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
mats@romeo.(none)
85548a8d86
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-09-04 14:58:34 +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