638aef7fa5
Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes
...
into mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes
2006-01-16 15:48:55 +01:00
559a243686
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-16 15:37:25 +01:00
1b75cf8aa6
Two minor fixes to be able to run tests from within a Windows Max
...
build directory.
2006-01-16 15:25:15 +01:00
7f0aa55e36
Manually merged
2006-01-16 16:57:15 +03:00
f9a1f53fe8
disabled.def:
...
disabling ndb_autodiscover for now. Removing frm's causes problems for cluster binlog
2006-01-16 13:15:11 +01:00
708f9b3ceb
Changes from the innodb-5.0-ss115 snapshot.
...
Fixed bugs:
BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
BUG#15650: "DELETE with LEFT JOIN crashes server"
BUG#15308: "Problem of Order with Enum Column in Primary Key"
BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
2006-01-16 14:32:43 +03:00
93bfec6297
ndb dd -
...
Change default page buffer cache size
2006-01-15 20:45:08 +01:00
c46f11fa96
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
2006-01-15 14:56:38 +03:00
ee2b765751
Changes from innodb-4.1-ss14 snapshot
...
Fixed BUG#14056: Column prefix index on UTF-8 primary key
causes "Can't find record.."
Also fixed bug 15991.
2006-01-15 14:50:47 +03:00
750f9fee90
A post-merge fix (Bug#12734)
2006-01-14 21:20:42 +03:00
1faf34fb8f
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-01-14 17:41:46 +01:00
0a64381cee
Merge mysql.com:/opt/local/work/mysql-4.1-12734
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-14 19:12:07 +03:00
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
86daf2d493
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2
2006-01-14 01:28:42 +03:00
e58314d482
BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct
...
'ref' accesses to all tables that are direct children of the nested join and are
not inner wrt their siblings.
2006-01-13 23:55:30 +03:00
4426d2ea30
BUG#14194: Problem with fulltext boolean search and apostrophe
...
Fixed that single apostrophe was considered as a word character.
2006-01-13 23:34:38 +04:00
d0a5e3db9f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
2006-01-13 21:30:05 +04:00
5581ef960a
BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
...
Allow fulltext index on VARCHAR columns longer than max key length.
2006-01-13 21:25:12 +04:00
4e1ccbe244
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103
...
into mysql.com:/home/alik/MySQL/devel/5.1-tree
2006-01-13 19:46:39 +03:00
acbacd921f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:46:38 +03:00
fb52fe5cf5
fix compile error on hp-ux setenv->putenv
...
print slave port as well
2006-01-13 17:44:37 +01:00
b1705ae5c4
Merge BUG#15110 from 5.0 into 5.1.
...
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
ceb1932984
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15347-bug-5.0-mysql
2006-01-13 18:42:15 +03:00
cea01c7387
Merge
2006-01-13 16:27:38 +03:00
0e2fac2d8c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-13 17:21:38 +04:00
949aced164
Merge mysql.com:/usr/home/bar/mysql-4.1.b15377
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-13 16:39:33 +04:00
21008ab2e8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-13 13:02:20 +01:00
fff1caa0be
enabled test
...
added missing debug_return
2006-01-13 13:01:19 +01:00
02570c20bf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15538-bug-5.0-mysql
2006-01-13 14:30:20 +03:00
78e93fbbcf
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 14:22:53 +04:00
b061cacb0b
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 14:16:16 +04:00
8dbedc9ffd
Merge
2006-01-13 12:13:50 +03:00
d033448fa1
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-13 09:22:02 +01:00
1246d2a264
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/v7
2006-01-13 07:50:45 +01:00
8c41e2ae2c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-13 07:31:35 +01:00
8651cee8ef
New support for ignoring blobs during scans. We now seek past them if we determine that they are of no use to us. This is a big save in tables with blobs. Far less memory overhead and the seek is quite a bit faster.
2006-01-12 20:32:40 -08:00
e648a8fe52
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/v7
2006-01-13 03:17:09 +01:00
46b867757a
updated mysql-test-run.pl to adjust to ndb replication testing
2006-01-13 03:13:58 +01:00
9a0f29562e
New test code fro CDD
2006-01-12 23:57:01 +01:00
f9ea947bdc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
2006-01-13 01:56:57 +03:00
d14e701446
Fix for bug #12198 "Temporary table aliasing does not work inside stored
...
functions".
We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
2006-01-13 01:51:56 +03:00
be993c9a23
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/slap-5.1
2006-01-12 13:31:12 -08:00
0f50bfa486
Fixed bug #16167
...
Added --use-threads option for porting to Windows.
2006-01-12 12:27:25 -08:00
acb31ce696
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-wl1563
2006-01-12 20:21:20 +01:00
4b731ddfb4
wl2325 wl2324
2006-01-12 19:51:02 +01:00
9772563d78
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-12 18:47:16 +01:00
3d478a6d9f
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-01-12 18:45:49 +01:00
fac966560a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-12 18:25:51 +01:00
0dffbdfb61
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-12 18:23:44 +01:00
254e626a56
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my51-wl2930_fixup
2006-01-12 18:21:35 +01:00
