cmiller@zippy.(none)
267aeffca3
Renumber events to make tests pass. This must be a result of removing extraneous
...
COMMITs -- the numbers collapse to fill the gaps.
2006-07-03 23:17:53 -04:00
cmiller@zippy.(none)
8caedc5efd
Removed bdb test where the binlog format is indeterminate and updated a test
...
where it isn't. Removed a test where the merge was incorrect (and a test
duplicated.)
2006-07-03 18:29:01 -04:00
cmiller@zippy.(none)
6110a83a0e
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-03 11:35:58 -04:00
gluh@mysql.com
d2b378d57f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
2006-07-03 13:19:18 +05:00
mikael@dator5.(none)
d5bb513021
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dator5.(none):/home/pappa/bug17138
2006-07-01 19:47:24 -04:00
dlenev@mysql.com
eb3ae6eb79
Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3
...
into mysql.com:/home/dlenev/mysql-5.1-bg18437
2006-07-02 02:12:53 +04:00
dlenev@mysql.com
d4450e6696
Fix for bug#18437 "Wrong values inserted with a before update trigger on
...
NDB table".
SQL-layer was not marking fields which were used in triggers as such. As
result these fields were not always properly retrieved/stored by handler
layer. So one might got wrong values or lost changes in triggers for NDB,
Federated and possibly InnoDB tables.
This fix solves the problem by marking fields used in triggers
appropriately.
Also this patch contains the following cleanup of ha_ndbcluster code:
We no longer rely on reading LEX::sql_command value in handler in order
to determine if we can enable optimization which allows us to handle REPLACE
statement in more efficient way by doing replaces directly in write_row()
method without reporting error to SQL-layer.
Instead we rely on SQL-layer informing us whether this optimization
applicable by calling handler::extra() method with
HA_EXTRA_WRITE_CAN_REPLACE flag.
As result we no longer apply this optimzation in cases when it should not
be used (e.g. if we have on delete triggers on table) and use in some
additional cases when it is applicable (e.g. for LOAD DATA REPLACE).
Finally this patch includes fix for bug#20728 "REPLACE does not work
correctly for NDB table with PK and unique index".
This was yet another problem which was caused by improper field mark-up.
During row replacement fields which weren't explicity used in REPLACE
statement were not marked as fields to be saved (updated) so they have
retained values from old row version. The fix is to mark all table
fields as set for REPLACE statement. Note that in 5.1 we already solve
this problem by notifying handler that it should save values from all
fields only in case when real replacement happens.
2006-07-02 01:51:10 +04:00
konstantin@mysql.com
1c4dffc8ca
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-07-01 22:13:42 +04:00
sergefp@mysql.com
775ec4fb85
Post-merge fix
2006-07-01 09:28:41 +04:00
mikael@dator5.(none)
55109a802d
Merge dator5.(none):/home/pappa/bug20583
...
into dator5.(none):/home/pappa/bug17138
2006-07-01 00:28:04 -04:00
mikael@dator5.(none)
9e56572e5c
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug20583
2006-07-01 00:22:25 -04:00
mikael@dator5.(none)
5853823bb2
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug17138
2006-07-01 00:19:23 -04:00
sergefp@mysql.com
f863685241
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16168-merge
2006-07-01 07:04:27 +04:00
evgen@moonbone.local
1459784aba
Reverted wrong bug fix (Bug#11228)
2006-07-01 01:37:20 +04:00
sergefp@mysql.com
784b3118a5
Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push
...
into mysql.com:/home/psergey/mysql-5.0-bug16168-merge
2006-07-01 01:25:59 +04:00
monty@mysql.com
2f86009c9e
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-06-30 19:15:17 +03:00
monty@mysql.com
2bec1b86bb
Reverted wrong bug fix (Bug#11228)
2006-06-30 18:29:27 +03:00
kroki@mysql.com
96bddcafe7
Bug#17226: Variable set in cursor on first iteration is assigned
...
second iterations value
During assignment to the BLOB variable in routine body the value
wasn't copied.
2006-06-30 18:14:22 +04:00
evgen@moonbone.local
a989f7261e
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/merge-5.1
2006-06-30 16:10:26 +04:00
sergefp@mysql.com
611e20d8e1
BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings:
...
- Added comments.
- Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.
2006-06-30 09:05:12 +04:00
monty@mysql.com
2356a54ca1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 04:28:04 +03:00
monty@mysql.com
f25b4e0464
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-06-30 04:27:19 +03:00
monty@mysql.com
a267b8f33c
Don't read ~/.my.cnf in mysqldump.test
2006-06-30 04:10:27 +03:00
monty@mysql.com
d76830faa5
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 02:35:52 +03:00
evgen@moonbone.local
3cc6d95d18
Merge
2006-06-30 02:03:09 +04:00
evgen@moonbone.local
9fd38baf13
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/merge-5.0
2006-06-30 02:02:20 +04:00
evgen@moonbone.local
83bc48f38e
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/merge-4.1
2006-06-30 01:12:16 +04:00
monty@hasky.mysql.fi
0b00ae6bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 23:41:33 +03:00
kroki@mysql.com
21e1655f4d
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
2006-06-30 00:24:47 +04:00
kroki@mysql.com
1bcf6b1d09
Bug#20230: routine_definition is not null
...
SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.
2006-06-30 00:21:55 +04:00
konstantin@mysql.com
7ca3749f59
Merge mysql.com:/opt/local/work/tmp_merge
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-06-29 18:34:49 +04:00
konstantin@mysql.com
3010430ddf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 18:17:37 +04:00
gluh@eagle.intranet.mysql.r18.ru
a230166f28
Fix for bug#13934 Silent truncation of table comments
...
Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING
2006-06-29 18:39:34 +05:00
konstantin@mysql.com
2d9d740dbe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:44:21 +04:00
konstantin@mysql.com
1cb6eb00a5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:43:23 +04:00
lars@dl145k.mysql.com
f3d8d60259
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-29 14:24:02 +02:00
lars@mysql.com
0e45d26993
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-29 14:14:08 +02:00
konstantin@mysql.com
06c2f1a2aa
Merge mysql.com:/opt/local/work/mysql-5.0-release
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 15:25:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
9901efea1f
Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
...
user name is calculated on function execution stage instead of parse stage
2006-06-29 15:50:44 +05:00
kroki@mysql.com
621a86ce82
Replace all numeric error code with symbolic names in trigger.test.
2006-06-29 13:45:43 +04:00
tomas@poseidon.ndb.mysql.com
0d22cc662b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-29 10:48:31 +02:00
knielsen@mysql.com
86268a54df
Fix test files to work with non-standard ports (MTR_BUILD_THREAD).
2006-06-29 10:35:16 +02:00
monty@mysql.com
3f22bc07c6
Fixed failing test rpl_ndb_auto_inc.test
...
Mark events_stress.test as 'big' as it's very slow on some machines
2006-06-29 03:24:33 +03:00
monty@narttu.mysql.fi
7b0f8635ae
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 00:09:53 +03:00
kroki@mysql.com
9c3805c9bb
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug10946
2006-06-28 23:54:18 +04:00
kroki@mysql.com
3e2e20ecfb
Bug#10946: Confusing error messeges in the case of duplicate trigger definition
...
It was hard to distinguish case, when one was unable to create trigger
on the table because trigger with same action time and event already
existed for this table, from the case, when one tried to create trigger
with name which was already occupied by some other trigger, since in
both these cases we emitted ER_TRG_ALREADY_EXISTS error and message.
Now we emit ER_NOT_SUPPORTED_YET error with appropriate additional
message in the first case. There is no sense in introducing separate
error for this situation since we plan to get rid of this limitation
eventually.
2006-06-28 23:50:50 +04:00
patg@govinda.patg.net
18d264a1ea
BUG #19773
...
Pushbuild fixes to result file, test, and header file for federated.
2006-06-28 12:18:21 -07:00
jimw@mysql.com
9bcb24b65e
Merge bk-internal:/home/bk/mysql-5.0-runtime
...
into mysql.com:/home/jimw/my/mysql-5.0-18005
2006-06-28 10:55:27 -07:00
patg@govinda.patg.net
87e88fe76b
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0-engines-bug19773
2006-06-28 10:11:43 -07:00