mskold/marty@linux.site
270fd100b7
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-07 09:32:34 +01:00
mskold/marty@mysql.com/linux.site
259d3dce26
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value
2007-02-07 09:19:33 +01:00
mskold/marty@linux.site
b13e5b8ee9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-06 23:42:24 +01:00
mskold/marty@mysql.com/linux.site
0446aa9cbd
Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range
2007-02-06 23:06:58 +01:00
mskold/marty@linux.site
491b78be67
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-02-01 09:50:38 +01:00
mskold/marty@mysql.com/linux.site
c16251ad7c
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment
2007-02-01 09:48:45 +01:00
mskold/marty@linux.site
4cc8da4d39
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-31 22:43:24 +01:00
mskold/marty@mysql.com/linux.site
5cd40ad30b
Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached
2007-01-31 22:38:06 +01:00
mskold/marty@linux.site
10c639b0ee
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-08 14:04:44 +01:00
mskold/marty@mysql.com/linux.site
5ebcc10e36
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Changed test since error mesage wasn't predictable
2007-01-08 13:53:37 +01:00
mskold/marty@linux.site
09f0134f23
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-08 10:42:37 +01:00
mskold/marty@mysql.com/linux.site
db0107b801
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
2007-01-08 10:38:53 +01:00
mskold/marty@linux.site
bcc738396e
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-01-03 15:11:47 +01:00
mskold/marty@mysql.com/linux.site
8272333243
ndb_use_transactions is set from value for command line flag
2007-01-03 14:56:26 +01:00
joerg@trift2.
60a3f102a4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/MySQL/M51/mysql-5.1
2007-01-02 17:13:42 +01:00
joerg@trift2.
c445abef91
server-tools/instance-manager/Makefile.am
...
Delete compiler-specific flag setting - it makes builds break.
2007-01-02 17:11:15 +01:00
mskold/marty@mysql.com/linux.site
866b02b934
Added --ndb-use-transactions
2007-01-02 15:47:58 +01:00
kent@kent-amd64.(none)
7281ab80c8
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2007-01-02 11:06:16 +01:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba
view.result:
...
Temporary work around for bug#25359
2007-01-02 11:01:48 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb
Many files:
...
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
Changed copyright header formatting some
plugin_example.c, daemon_example.c:
Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:04:59 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01:00
stewart@willster.(none)
344d78a563
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
2006-12-28 22:53:21 +11:00
tomas@poseidon.mysql.com
4333bcabd7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2006-12-27 19:36:41 +01:00
tomas@poseidon.
7b9a5f6de2
ndb: remove compiler warnings
2006-12-27 14:16:34 +01:00
tomas@poseidon.
044c410968
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2006-12-27 11:01:54 +01:00
kent@kent-amd64.(none)
2a10b99907
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-27 02:24:40 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa
Many files:
...
Changed header to GPL version 2 only
2006-12-27 02:23:51 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
82b03f29ac
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
2006-12-26 16:23:05 -08:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
2006-12-26 12:33:21 -08:00
svoj@mysql.com/june.mysql.com
28d3ee656d
After merge fix.
2006-12-26 22:10:02 +04:00
svoj@june.mysql.com
838fe3a04e
Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
2006-12-26 18:04:31 +04:00
svoj@mysql.com/june.mysql.com
591712f53f
BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to
...
repair it
Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.
DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.
With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.
2006-12-26 17:47:30 +04:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
kent@kent-amd64.(none)
3368730535
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:07:31 +01:00
patg@radha.patg.net
edc6cfa2c3
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 12:23:24 -05:00
baker@bk-internal.mysql.com
abef375178
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-12-22 18:04:33 +01:00
patg@radha.patg.net
2e538b4192
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 08:57:32 -05:00
msvensson@pilot.mysql.com
fa33971252
Potential use of NULL pointer in 'plugin_for_each_with_mask', check pointer
...
before referencing it.
2006-12-22 12:27:26 +01:00
msvensson@pilot.mysql.com
791a5cf75e
Merge pilot.mysql.com:/home/msvensson/mysql/my51-ndb-gca-my51-m
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
2006-12-22 12:14:37 +01:00
msvensson@pilot.mysql.com
eb7500f44a
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061220175325|03033
2006-12-22 12:14:12 +01:00
msvensson@pilot.mysql.com
abe43135b1
Bug#22694 "function plugin_foreach_with_mask() uses an uninitialized pointer"
...
Fix uninitialized memory.
2006-12-22 12:12:58 +01:00
patg@radha.patg.net
efefea6a5e
WL #3031
...
* Various windows errors fixed
* Increased max key length for federated
2006-12-21 22:38:54 -05:00
istruewing@chilla.local
bd929199b3
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-21 19:04:31 +01:00
istruewing@chilla.local
dee46f9100
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-21 18:41:01 +01:00
msvensson@pilot.mysql.com
045a953909
Merge bk-internal:/home/bk/mysql-5.1-ndb
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-ndb
2006-12-21 17:38:44 +01:00
istruewing@chilla.local
ea353c72a6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2006-12-21 17:13:38 +01:00