evgen@moonbone.local
55790f74bb
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14093-bug-5.0-mysql
2005-11-03 13:55:08 +03:00
evgen@moonbone.local
30fdafea76
Fix bug #14093 Query takes a lot of time when date format is not valid
...
Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.
convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.
2005-11-03 13:53:49 +03:00
holyfoot@deer.(none)
c5313e8d4f
Fix for bug #14268 (Bad FLOAT->DECIMAL conversion)
2005-11-03 13:49:37 +04:00
sergefp@mysql.com
a88ecb9a3d
Post-merge fixes
2005-11-03 12:38:46 +03:00
msvensson@neptunus.(none)
d028e8e063
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 10:34:15 +01:00
holyfoot@mysql.com
284f652980
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.14183
2005-11-03 12:50:28 +04:00
sergefp@mysql.com
7357e470a4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
2005-11-03 11:20:01 +03:00
msvensson@neptunus.(none)
25f5062886
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-03 08:42:02 +01:00
sergefp@mysql.com
8fefb36800
Merged
2005-11-03 10:28:12 +03:00
holyfoot@mysql.com
c2640d292a
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-03 11:05:34 +04:00
igor@rurik.mysql.com
f878cc589d
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-02 22:24:36 -08:00
igor@rurik.mysql.com
44dd303c47
Post review fixes.
2005-11-02 22:13:10 -08:00
evgen@moonbone.local
69d985cc9d
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-03 01:51:47 +03:00
igor@rurik.mysql.com
cb439945c0
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-11-02 14:01:08 -08:00
igor@rurik.mysql.com
fddc99bcd8
#view.test#:
...
new file
sql_table.cc, handler.h:
Fixed bug #14540 .
Added error mnemonic code HA_ADMIN_NOT_BASE_TABLE
to report that an operation cannot be applied for views.
view.test, view.result:
Added a test case for bug #14540 .
errmsg.txt:
Fixed bug #14540 .
Added error ER_CHECK_NOT_BASE_TABLE.
2005-11-02 13:44:58 -08:00
msvensson@neptunus.(none)
ce50208814
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-11-02 22:06:00 +01:00
msvensson@neptunus.(none)
9c94aef407
BUG#14514
...
- Add tests
2005-11-02 17:34:40 +01:00
evgen@moonbone.local
c347c60998
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/14466-bug-5.0-mysql
2005-11-02 18:00:13 +03:00
monty@mysql.com
54d9d2e116
Portability fix
...
(BDB test failed in Intel64)
2005-11-02 16:28:58 +02:00
holyfoot@mysql.com
6b5c422fe1
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.13573
2005-11-02 13:01:21 +04:00
sergefp@mysql.com
96ff1e808a
BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup
...
for underlying tables of a merge VIEWs, too.
2005-11-02 07:05:19 +03:00
patg@krsna.patg.net
50817d304b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 17:07:13 -08:00
patg@krsna.patg.net
add878e818
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
2005-11-01 09:08:50 -08:00
evgen@moonbone.local
bbe58c7e26
Manually merged
2005-11-01 19:47:53 +03:00
hf@deer.(none)
0ec768c407
Conflicts resolving
2005-11-01 20:37:27 +04:00
evgen@moonbone.local
47059b89f5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14186-bug-4.1-mysql
2005-11-01 17:34:19 +03:00
evgen@moonbone.local
2343ff86ca
Fix bug #14466 lost sort order in GROUP_CONCAT() in a view
...
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.
2005-11-01 17:27:10 +03:00
monty@mysql.com
e5f48e13bf
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
...
Fix for bug #14536 : SELECT @a,@a:=... fails with prepared statements
2005-11-01 15:54:30 +02:00
hf@deer.(none)
f3502cd983
Additional fix for bug #14445 (analyse.test fails)
2005-11-01 16:14:26 +04:00
hf@deer.(none)
bb17195a1c
Fix for bug #14183 (ctype_cp983.test fails with the embedded server)
2005-11-01 13:18:46 +04:00
patg@krsna.patg.net
d5b252e630
BUG# 14532
...
Post-review fixes
2005-10-31 17:26:45 -08:00
patg@krsna.patg.net
7b611b33f2
BUG #14532
...
Added FIELD_TYPE_BIT to field method 'needs_quotes' to make BIT columns
work.
2005-10-31 17:17:16 -08:00
jani@ua141d10.elisa.omakaista.fi
da64397b69
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 12:20:54 +02:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
hf@deer.(none)
5150bd8f9f
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.12839
2005-10-31 12:24:43 +04:00
msvensson@neptunus.(none)
531b847f23
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-31 09:14:58 +01:00
sergefp@mysql.com
4ad3313cd7
BUG#14139 - Merge to 5.0
2005-10-31 09:22:33 +03:00
jimw@mysql.com
b919b29da6
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:52:10 -07:00
patg@krsna.patg.net
22fe31e4d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into krsna.patg.net:/home/patg/mysql-build/mysql-4.1
2005-10-28 18:23:23 -07:00
jimw@mysql.com
0e572ff475
Merge mysql.com:/home/jimw/my/mysql-4.1-13796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:19:19 -07:00
sergefp@mysql.com
09a4d0c7a7
4.1->5.0 merge
2005-10-29 02:36:57 +04:00
sergefp@mysql.com
3e76aa38fa
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-29 02:19:38 +04:00
sergefp@mysql.com
8b9bab2763
Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
...
do advance the source pointer over 2 bytes that specify value length.
2005-10-28 23:31:32 +04:00
evgen@moonbone.local
ddea0b44e3
Manually merged
2005-10-28 23:17:51 +04:00
sergefp@mysql.com
7be7912135
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-oct25-test
2005-10-28 22:55:02 +04:00
sergefp@mysql.com
eb57f520ba
Merge
2005-10-28 22:31:41 +04:00
sergefp@mysql.com
f220d87476
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug14139
2005-10-28 21:42:01 +04:00
jimw@mysql.com
f6995841b3
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-28 10:17:37 -07:00
msvensson@neptunus.(none)
06c17bac2a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 19:10:05 +02:00
pem@mysql.com
1eaf95d5ca
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14256/mysql-5.0
2005-10-28 14:55:01 +02:00