dlenev@brandersnatch.localdomain
007a205918
Fix for bugs:
...
#5860 "Multi-table UPDATE does not activate update triggers"
#6812 "Triggers are not activated for INSERT ... SELECT"
#8755 "Trigger is not activated by LOAD DATA".
This patch also implements proper handling of triggers for special forms
of insert like REPLACE or INSERT ... ON DUPLICATE KEY UPDATE.
Also now we don't call after trigger in case when we have failed to
inserted/update or delete row. Trigger failure should stop statement
execution.
I have not properly tested handling of errors which happen inside of
triggers in this patch, since it is simplier to do this once we will be
able to access tables from triggers.
2005-05-24 22:19:33 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
187ee4712b
Fixed bug 10465.
2005-05-12 17:37:38 +03:00
ramil@mysql.com
152f751831
fix (Bug #8295 and #8296 : varchar and varbinary conversion)
...
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
2005-05-12 15:56:04 +05:00
konstantin@mysql.com
7ca3f018e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-9478
2005-05-12 11:17:38 +04:00
konstantin@mysql.com
d0e24153b9
A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"
...
(crash on attempt to re-execute a statement with an open cursor) +
post-review fixes.
2005-05-12 11:16:12 +04:00
igor@rurik.mysql.com
3351233349
Manual merge
2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61
Many files:
...
Fixed bug #8528 .
Representation for single-table views was made similar to
representation for multi-table views.
view.test:
Added test case for bug #8528 .
view.result:
Added test case for bug #8528 . Fixed other test cases.
2005-05-10 16:31:13 -07:00
gbichot@quadita2.mysql.com
3c81444476
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 20:35:12 +02:00
gluh@mysql.com
efaeb069e7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0
2005-05-10 18:35:11 +00:00
gluh@mysql.com
75b7fef44f
Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns error
...
additional fix after review
2005-05-10 18:34:04 +00:00
gbichot@quadita2.mysql.com
b6ca1a1485
comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report.
2005-05-10 15:55:22 +02:00
gbichot@quadita2.mysql.com
d6e1e5b417
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 11:31:46 +02:00
msvensson@neptunus.(none)
f3890e9440
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-10 10:49:50 +02:00
msvensson@neptunus.(none)
7133dc5a22
Remove testcode
2005-05-10 10:45:16 +02:00
jimw@mysql.com
cde9f56b45
Merge
2005-05-09 11:28:57 -07:00
bar@noter.(none)
c783cb3d7e
SUBSTR with negative argument didn't work
...
with multi-byte strings, length() instead
of numchars() where used in a mistake.
2005-05-09 20:55:06 +05:00
antony@ltantony.mysql.com
ddf6225def
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733
2005-05-09 14:50:56 +01:00
antony@ltantony.mysql.com
cc3bfc6ff1
Bug#8733 - server accepts malformed query (multiply mentioned distinct)
...
Detect conflicting options in SELECT
2005-05-09 14:31:46 +01:00
dlenev@mysql.com
feb8a43c4d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-05-09 17:01:23 +04:00
jimw@mysql.com
3591b93874
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 05:30:11 -07:00
dlenev@mysql.com
e7f29e1904
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
holyfoot@mysql.com
8d12a8b124
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.0.emb
2005-05-09 17:11:37 +05:00
holyfoot@hf-ibm.(none)
5ddaf35c26
Fix for bug #9632 (strict.test fails in -embedded-server mode)
2005-05-09 16:26:06 +05:00
msvensson@neptunus.(none)
1e889f3beb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 12:48:32 +02:00
msvensson@neptunus.(none)
891b64fd84
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 12:16:59 +02:00
jimw@mysql.com
59f5252dc9
Merge mysql.com:/home/jimw/my/mysql-4.1-10435
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-09 02:30:25 -07:00
msvensson@neptunus.(none)
34cec09efb
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
670eef8756
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 11:23:12 +02:00
dlenev@mysql.com
12621f349b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913
2005-05-09 12:18:19 +04:00
ramil@ram-book.(none)
1092c4d8b4
Fix for bug #9798 : Rollup crash with InnoDB in setup_sum_funcs().
2005-05-09 11:43:52 +05:00
mskold@mysql.com
9e1117c3e5
Merge
2005-05-08 22:52:55 +02:00
mskold@mysql.com
c216278ab2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-08 22:46:09 +02:00
mskold@mysql.com
66f881a8f6
Removed call to cond_push for empty cond
2005-05-08 22:42:40 +02:00
mskold@mysql.com
6f38bd937e
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-08 22:25:38 +02:00
mwagner@ultrafly.mysql.com
8945bb5d1d
Merge bk-internal:/home/bk/mysql-4.1
...
into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1
2005-05-08 19:16:37 +02:00
mwagner@ultrafly.mysql.com
b0774772d9
errmsg.txt:
...
Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195 ).
2005-05-08 19:14:28 +02:00
jimw@mysql.com
d1a745b0ba
Add special error message for .frm files with an un-understood version, like
...
those from 5.0 with new datatypes. (Bug #10435 )
2005-05-07 13:57:22 -07:00
mskold@mysql.com
bea71274f7
Merge
2005-05-07 22:49:04 +02:00
mskold@mysql.com
89d8290eb3
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-05-07 22:48:16 +02:00
mskold@mysql.com
a785052d7d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-05-07 22:44:49 +02:00
mskold@mysql.com
1eaa54a4d8
Removed double cond_push
2005-05-07 22:41:30 +02:00
mskold@mysql.com
cb8d2905aa
bug#9813: Post review fixes
2005-05-07 22:04:52 +02:00
lenz@mysql.com
f09fc52bc4
- Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of
...
#include <mysql_priv.h>
2005-05-07 22:04:10 +02:00
antony@ltantony.mysql.com
4fe845e8d0
Merge
2005-05-07 16:50:22 +01:00
gbichot@quadita2.mysql.com
a85ecdb670
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-07 17:26:01 +02:00
jimw@mysql.com
b4dcd8f4ab
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-05-07 08:26:00 -07:00
holyfoot@hf-ibm.(none)
a16a207456
Fix for embedded server to compile
2005-05-07 20:25:59 +05:00
jimw@mysql.com
80933d9f95
Merge
2005-05-07 08:25:58 -07:00
gluh@mysql.com
3ce315ce33
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10261
2005-05-07 15:25:57 +00:00
gluh@mysql.com
f6bf2680b2
Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
...
I_S table columns information is available for any user
2005-05-07 15:14:34 +00:00