knielsen@mysql.com
e5598d2fad
Windows Visual Studio 2003 fixes.
2006-01-16 09:56:10 +01:00
aivanov@mysql.com
9ae629e80d
Null-merge (innodb-4.1-ss14 is not to be applied to
...
higher versions)
2006-01-15 16:43:30 +03:00
aivanov@mysql.com
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
aivanov@mysql.com
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
konstantin@mysql.com
750f9fee90
A post-merge fix (Bug#12734)
2006-01-14 21:20:42 +03:00
konstantin@mysql.com
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
konstantin@mysql.com
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
sergefp@mysql.com
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
sergefp@mysql.com
dc14d007db
BUG#16393: post-review fixes: fix comments.
2006-01-14 01:26:42 +03:00
sergefp@mysql.com
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
svoj@april.(none)
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
svoj@april.(none)
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
evgen@moonbone.local
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
evgen@moonbone.local
cea01c7387
Merge
2006-01-13 16:27:38 +03:00
bar@mysql.com
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
bar@mysql.com
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
bar@mysql.com
977731b3fc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 16:21:44 +04:00
evgen@moonbone.local
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
bar@mysql.com
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
bar@mysql.com
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
evgen@moonbone.local
8dbedc9ffd
Merge
2006-01-13 12:13:50 +03:00
jonas@perch.ndb.mysql.com
972723b02e
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-01-13 09:29:24 +01:00
jonas@perch.ndb.mysql.com
026e3984b2
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-13 07:41:49 +01:00
jonas@perch.ndb.mysql.com
8dce5e198d
bug#15619 - ndb_autodiscover sometimes fails
2006-01-13 07:40:15 +01:00
jonas@perch.ndb.mysql.com
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
dlenev@mysql.com
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
dlenev@mysql.com
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
jani@ua141d10.elisa.omakaista.fi
4d59111a1c
Fixed a bug in merge.
2006-01-12 20:49:47 +02:00
jani@ua141d10.elisa.omakaista.fi
8f3645e6f0
Fix for Netware build.
2006-01-12 20:31:00 +02:00
jani@ua141d10.elisa.omakaista.fi
617585eb33
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2006-01-12 20:28:23 +02:00
msvensson@neptunus.(none)
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
msvensson@neptunus.(none)
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
msvensson@neptunus.(none)
7f919f9ef7
Use "test ! -s" to check that file does not exist
2006-01-12 18:19:57 +01:00
jani@ua141d10.elisa.omakaista.fi
8c6a32b997
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-01-12 17:47:58 +02:00
jani@ua141d10.elisa.omakaista.fi
af845f6eff
NetWare specific change to increase thread stack size.
...
Changes to Netware specific mysqld_safe.c
2006-01-12 15:10:12 +02:00
monty@mysql.com
4d0fd66bdd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-01-12 14:40:39 +02:00
bar@mysql.com
6301568290
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 16:07:06 +04:00
bar@mysql.com
5f17cbaba4
sql_show.cc:
...
after-merge fix for
bug#15581 COALESCE function truncates mutli-byte TINYTEXT values
2006-01-12 16:05:46 +04:00
bar@mysql.com
832148ded2
ctype_utf8.result:
...
After merge fix:
fixing order of results.
2006-01-12 13:08:49 +04:00
sergefp@mysql.com
40b7fab55d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
2006-01-12 11:55:34 +03:00
sergefp@mysql.com
aa00d65ead
Fix typo bug in previous cset
2006-01-12 11:11:16 +03:00
sergefp@mysql.com
e40759e370
BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
...
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7
Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
anozdrin@mysql.com
00936e2777
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alik/MySQL/devel/5.0-bug15103
2006-01-12 03:05:29 +03:00
anozdrin@mysql.com
dae00c191f
Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
2006-01-12 03:02:52 +03:00
reggie@linux.site
b03abd2888
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into linux.site:/home/reggie/work/mysql-5.0
2006-01-11 16:34:51 -06:00
reggie@linux.site
8de137a3aa
simple Windows compile fixes.
2006-01-11 16:18:11 -06:00
evgen@moonbone.local
41ef34356c
Fixed bug #15538 : unchecked table absence caused server crash.
...
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.
Modified rules:
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9
Fixed bug #15347 : Wrong result of subselect when records cache and set
...
functions are involved.
When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions
to calculate their values correctly. Normally this null_row flag is cleared for
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are
always evaluated as nulls and whole select produces wrong result.
flush_cached_records() now clears null_row flag at the very beginning.
2006-01-11 23:16:21 +03:00