brian@zim.(none)
f99ce7ad62
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-22 11:40:29 -07:00
gkodinov@mysql.com
b2494b8174
Merge mysql.com:/home/kgeorge/mysql/5.0/B18745
...
into mysql.com:/home/kgeorge/mysql/5.1/B18745
2006-05-22 18:15:47 +03:00
gkodinov@mysql.com
b357c232fc
Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration
...
Moved the InnoDB related test from func_group.test to innodb_mysql.test
2006-05-22 16:10:53 +03:00
pekka@mysql.com
641c92dd62
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my51
2006-05-21 21:58:00 +02:00
holyfoot@mysql.com
b9cd71e622
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-21 18:22:13 +05:00
pekka@mysql.com
1a519e2971
ndb - bug#19956 (occurs only in v5.0)
2006-05-21 11:04:57 +02:00
jimw@mysql.com
8262c3c38e
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-19 19:07:33 -07:00
jimw@mysql.com
2b13192c2e
Merge mysql.com:/home/jimw/my/mysql-5.0-1039
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-19 16:17:24 -07:00
tomas@poseidon.ndb.mysql.com
00188154c9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-19 23:20:33 +02:00
sergefp@mysql.com
49e23937e4
Merge mysql.com:/home/psergey/tmp_merge
...
into mysql.com:/home/psergey/mysql-5.1-merge
2006-05-19 16:00:29 +04:00
tomas@poseidon.ndb.mysql.com
d0fd5ecde8
Bug #19395 mysqld does not always detect cluster shutdown
...
Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
2006-05-18 23:38:07 +02:00
igor@rurik.mysql.com
710d422404
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2006-05-18 13:17:59 -07:00
lars@mysql.com
399a1b845b
After merge fixes
2006-05-18 21:40:52 +02:00
igor@rurik.mysql.com
3b3e6ecb95
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-18 11:30:42 -07:00
brian@zim.(none)
f373c81ac8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/dep-5.1
2006-05-18 11:23:21 -07:00
jimw@mysql.com
7d54b004a2
Bug #13975 : "same string" + 0 has 2 different results
...
The 'decimals' member of Item_func was being improperly initialized,
which resulted in improper results when handling large numeric values.
2006-05-18 10:34:01 -07:00
lars@mysql.com
87bb4f95ea
Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new
2006-05-18 18:38:50 +02:00
evgen@moonbone.local
894092becf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/19077-bug-5.0-mysql
2006-05-18 16:01:13 +04:00
knielsen@mysql.com
339afc620f
After-merge fix.
2006-05-18 13:35:15 +02:00
knielsen@mysql.com
a061c90d8a
Merge mysql.com:/usr/local/mysql/tmp_merge
...
into mysql.com:/usr/local/mysql/merge-5.1
2006-05-18 11:56:50 +02:00
igor@rurik.mysql.com
1802e6895a
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
2006-05-17 20:56:52 -07:00
igor@rurik.mysql.com
9ec8101813
Fixed bug #19816 .
...
This bug was introduced when the patch resolving the
performance problem 17164 was applied. As a result
of that modification the not_null_tables attributes
were calculated incorrectly for constant OR conditions.
This triggered invalid conversion of outer joins into
inner joins.
2006-05-17 20:48:48 -07:00
igor@rurik.mysql.com
0d069edaa2
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 17:20:03 -07:00
evgen@moonbone.local
1d820585ae
Fixed bug#19077: A nested materialized derived table is used before being populated.
...
The convert_constant_item() function converts constant items to ints on
prepare phase to optimize execution speed. In this case it tries to evaluate
subselect which contains a derived table and is contained in a derived table.
All derived tables are filled only after all derived tables are prepared.
So evaluation of subselect with derived table at the prepare phase will
return a wrong result.
A new flag with_subselect is added to the Item class. It indicates that
expression which this item represents is a subselect or contains a subselect.
It is set to 0 by default. It is set to 1 in the Item_subselect constructor
for subselects.
For Item_func and Item_cond derived classes it is set after fixing any argument
in Item_func::fix_fields() and Item_cond::fix_fields accordingly.
The convert_constant_item() function now doesn't convert a constant item
if the with_subselect flag set in it.
2006-05-18 00:55:28 +04:00
igor@rurik.mysql.com
62f61f527f
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-05-17 11:46:21 -07:00
holyfoot@mysql.com
54a75ed1d5
Merge mysql.com:/home/hf/work/mysql-4.1.clean
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-17 18:01:05 +05:00
gkodinov@mysql.com
9f9a76eb6e
Merge mysql.com:/home/kgeorge/mysql/5.0/tmp_merge
...
into mysql.com:/home/kgeorge/mysql/5.1/merge
2006-05-17 13:29:20 +03:00
tomas@poseidon.ndb.mysql.com
0cb31d7d5f
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
2006-05-17 08:34:48 +02:00
igor@rurik.mysql.com
767d25dabd
Fixed bug #19573 .
...
The select statement that specified a view could be
slightly changed when the view was saved in a frm file.
In particular references to an alias name in the HAVING
clause could be substituted for the expression named by
this alias.
This could result in an error message for a query of
the form SELECT * FROM <view>. Yet no such message
appeared when executing the query specifying the view.
2006-05-16 22:19:44 -07:00
tulin@production.mysql.com
b3d8b9bbd8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/tulin/mysql-5.0
2006-05-16 21:46:00 +02:00
tomas@poseidon.ndb.mysql.com
86c898febe
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 20:58:19 +02:00
tomas@poseidon.ndb.mysql.com
c5987ab67a
Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
...
- adoptions to handle binlog
2006-05-16 20:56:45 +02:00
aelkin@mysql.com
8648412531
Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
2006-05-16 19:33:24 +03:00
aelkin@mysql.com
713d17d5e7
BUG#14157: utf8 encoding in binlog without set character_set_client: e.g DROP temporary
...
fixing encoding example because of table names can not be in koi8r
on some platforms.
2006-05-16 16:50:05 +03:00
tomas@poseidon.ndb.mysql.com
b467bdfcdb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-16 12:33:24 +02:00
andrey@lmy004.
743a57fda1
disable events_logs_tests
2006-05-16 12:05:15 +02:00
sergefp@mysql.com
b7c52881d1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug19618
2006-05-16 13:46:30 +04:00
tomas@poseidon.ndb.mysql.com
6cb699d208
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:37:40 +02:00
tomas@poseidon.ndb.mysql.com
08438b6054
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-16 10:21:37 +02:00
lars@mysql.com
a29504cbcb
Test used a charset not available on many platforms
2006-05-16 10:01:07 +02:00
tnurnberg@mysql.com
0613889746
Merge mysql.com:/home/tmp_merge
...
into mysql.com:/home/mysql-5.1-18997e
2006-05-16 03:33:43 +02:00
tnurnberg@mysql.com
d1311e1ac7
Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
...
if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.
2006-05-16 03:32:24 +02:00
cmiller@zippy.(none)
d8330e2858
Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-05-15 19:26:49 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
414d5c0983
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-16 00:37:34 +03:00
lars@mysql.com
3148efad35
Merge mysql.com:/users/lthalmann/bkroot/andrei-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
2006-05-15 20:49:14 +02:00
tomas@poseidon.ndb.mysql.com
5971c0872b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-15 20:35:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
1b524d6b5f
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
2006-05-15 21:33:47 +03:00
aelkin@dl145j.mysql.com
6bdd2bbcc1
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145j.mysql.com:/tmp/andrei/5.0
2006-05-15 19:57:11 +02:00
tomas@poseidon.ndb.mysql.com
747dc71f9f
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-15 18:44:17 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3846438a9c
Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table"
...
The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.
This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.
Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.
2006-05-15 19:41:04 +03:00