svoj@mysql.com/april.(none)
94040c54b3
Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
2006-10-06 11:01:39 +05:00
svoj@mysql.com/april.(none)
c67aa031d6
Addition to fix for bug#10974. Fixed spelling.
2006-10-06 10:54:47 +05:00
svoj@mysql.com/april.(none)
d41340516f
Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines
2006-10-05 19:02:29 +05:00
svoj@mysql.com/april.(none)
16c13a588f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
2006-10-05 18:56:10 +05:00
svoj@mysql.com/april.(none)
b141a7c1b9
BUG#21381 - Engine not notified about multi-table UPDATE IGNORE
...
Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.
BDB has removed duplicate rows which is not expected.
NDB returns an error.
For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.
2006-10-05 18:23:53 +05:00
svoj@mysql.com/april.(none)
361c46eefe
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-10-02 14:42:12 +05:00
istruewing@chilla.local
fe7de5b96c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20627
2006-09-29 17:59:56 +02:00
svoj@mysql.com/april.(none)
0297046a10
Fix a test case according to fix for bug#10974.
2006-09-29 19:00:52 +05:00
evgen@moonbone.local
ee67c4c453
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/5505-bug-5.0-opt-mysql
2006-09-29 01:01:52 +04:00
evgen@moonbone.local
f6fbbf2002
Fixed bug#5505: Wrong error message on INSERT into a view
...
On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.
A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.
2006-09-29 01:00:18 +04:00
svoj@mysql.com/april.(none)
ad7da7f1de
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
2006-09-29 00:00:27 +05:00
svoj@mysql.com/april.(none)
2de51adffa
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b
BUG#21617 - crash when selecting from merge table with inconsistent indexes
...
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.
If number of keys in merge table is not bigger than requested key number,
return error.
2006-09-28 22:10:06 +05:00
gkodinov@dl145s.mysql.com
b0167d265f
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:36:04 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-28 10:19:25 +02:00
svoj@mysql.com/april.(none)
b724a03e08
After merge fix.
2006-09-27 18:33:31 +05:00
gluh@mysql.com/gluh.(none)
437c94317b
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
svoj@mysql.com/april.(none)
bfb6ff6bdd
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:42:00 +05:00
gkodinov/kgeorge@macbook.gmz
903387afc0
Bug #21174 : Index degrades sort performance and optimizer does not honor IGNORE INDEX
...
- reversed the patch for 5.0 and moved to 5.1
2006-09-27 12:53:53 +03:00
igor@rurik.mysql.com
df1376a542
Merge rurik.mysql.com:/home/igor/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug21646
2006-09-25 07:40:54 -07:00
igor@rurik.mysql.com
c0569012d0
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-25 06:46:15 -07:00
igor@rurik.mysql.com
a661bdda19
Fixed bug #21646 .
...
Presence of a subquery in the ON expression of a join
should not block merging the view that contains this join.
Before this patch the such views were converted into
into temporary table views.
2006-09-25 06:15:14 -07:00
igor@rurik.mysql.com
55dd569bab
Fixed bug #21853 : assert failure for a grouping query with
...
an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.
2006-09-25 05:24:07 -07:00
lars/lthalmann@mysql.com/dl145h.mysql.com
bbf84d6b9e
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-23 06:00:50 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
7e45d80362
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-09-23 05:58:48 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
738cd74b52
After merge fixes
2006-09-21 13:38:01 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2c5dc57e27
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 13:28:16 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
9538acf5dc
Adding proper setup phase for test case rpl_insert_id
2006-09-21 13:19:52 +02:00
istruewing@chilla.local
f083782c42
Merge chilla.local:/home/mydev/mysql-5.0--main
...
into chilla.local:/home/mydev/mysql-5.0-toteam
2006-09-21 10:55:23 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
fe782f92d6
Vertical printout in test to make easier to read
2006-09-21 03:32:42 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
6aded45614
Fix of result files from merge
2006-09-21 00:59:48 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
d20e326504
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-09-21 00:05:56 +02:00
igor@rurik.mysql.com
2e2c5a20c0
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-20 09:47:36 -07:00
igor@rurik.mysql.com
d957636471
Fixed bug #20108 .
...
Any default value for a enum fields over UCS2 charsets was corrupted
when we put it into the frm file, as it had been overwritten by its
HEX representation.
To fix it now we save a copy of structure that represents the enum
type and when putting the default values we use this copy.
2006-09-20 09:46:12 -07:00
igor@rurik.mysql.com
20b3e8a2f8
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-20 08:10:21 -07:00
igor@rurik.mysql.com
f2225cab27
Fixed bug #22015 : crash with GROUP_CONCAT over a derived table
...
that returns the results of aggregation by GROUP_CONCAT.
The crash was due to an overflow happened for the field
sortoder->length.
The fix prevents this overflow exploiting the fact that the
value of sortoder->length cannot be greater than the value of
thd->variables.max_sort_length.
2006-09-20 08:08:57 -07:00
istruewing@chilla.local
e9e58c6682
Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID
...
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
INSERT DELAYED ignored an explicitly set INSERT_ID and session
specific auto_increment_* variables.
The problem was that the inserts are done by a system thread,
which does not have access to the session variables of the user
thread.
On a proposal of Guilhem I fixed it so that the variables are
copied to the data structure for every delayed row. The system
thread sets its session variables from these values.
2006-09-20 11:05:11 +02:00
gkodinov/kgeorge@rakia.(none)
8618353374
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
2006-09-20 12:03:56 +03:00
gkodinov/kgeorge@rakia.(none)
8577d7913e
fixed merge
2006-09-20 12:02:58 +03:00
svoj@mysql.com/april.(none)
c0ebc0fb2a
BUG#10974 - No error message if merge table based on union of innodb, memory
...
Fixed confusing error message from the storage engine when
it fails to open underlying table. The error message is issued
when a table is _opened_ (not when it is created).
2006-09-20 01:40:59 +05:00
igor@rurik.mysql.com
0279c91d99
Post-merge corrections.
2006-09-19 12:18:24 -07:00
igor@rurik.mysql.com
25368c359e
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-09-19 10:09:02 -07:00
gkodinov/kgeorge@rakia.(none)
2da037c7d5
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21540-5.0-opt
2006-09-19 19:18:52 +03:00
igor@rurik.mysql.com
294c0ccaa9
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-09-19 08:42:58 -07:00
svoj@may.pils.ru
43097593e3
Merge may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1
...
into may.pils.ru:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-18 20:35:33 +05:00
gkodinov@dl145s.mysql.com
cf9d1c9152
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 19:01:07 +04:00
svoj@april.(none)
f21eadfc74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-18 16:23:45 +05:00
gkodinov@dl145s.mysql.com
2ec485f06e
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-18 12:20:20 +02:00