igor@olga.mysql.com
f6d6ac1e0f
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2006-07-06 13:40:08 -07:00
igor@olga.mysql.com
6e1c8ad830
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-4.1-opt
2006-07-06 11:38:48 -07:00
igor@olga.mysql.com
0e3d2dafd6
Fixed bug #18243 .
...
The implementation of the method Item_func_reverse::val_str
for the REVERSE function modified the argument of the function.
This led to wrong results for expressions that contained
REVERSE(ref) if ref occurred somewhere else in the expressions.
2006-07-06 11:11:49 -07:00
gkodinov@rakia.(none)
0a169c4cfd
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/test
2006-07-06 13:26:23 +03:00
gkodinov@mysql.com
732b175c29
Bug #20569 Garbage in DECIMAL results from some mathematical functions
...
Adding decimal "digits" in multiplication resulted in signed overflow and
producing wrong results.
Fixed by using large enough buffers and intermediary result types :
dec2 (currently longlong) to hold result of adding decimal "digits"
(currently int32).
2006-07-06 13:18:05 +03:00
sergefp@mysql.com
d581287b34
Better comments for void Item::top_level_item()
2006-07-04 13:28:30 +04:00
gkodinov@mysql.com
ae0a3e0dbb
Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
...
into mysql.com:/home/kgeorge/mysql/5.0/B16110
2006-07-04 12:20:45 +03:00
gkodinov@mysql.com
b64089e655
Bug #16110 : insert permitted into view col w/o default value
...
When compiling INSERT statements the check whether columns are provided values
depends on the flag whether a field is used in that query (Field::query_id).
However the check for updatability of VIEW columns (check_view_insertability())
was calling fix_fields() and thus setting the Field::query_id even for the
view fields that are not referenced in the current INSERT statement.
So the correct check for columns without default values
( check_that_all_fields_are_given_values() ) is assuming that all the VIEW
columns were mentioned in the INSERT field list and was issuing no
warnings or errors.
Fixed check_view_insertability() to turn off the flag whether or not to set
Field::query_id (THREAD::set_query_id) before calling fix fields and restore
it when it's done.
2006-07-04 12:10:12 +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
tomas@poseidon.ndb.mysql.com
5f5c3f9ceb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
...
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
2006-06-30 00:02:17 +02:00
tomas@poseidon.ndb.mysql.com
eb4a633a00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
2006-06-30 00:00:27 +02: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
tomas@poseidon.ndb.mysql.com
747c17ffa3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-29 23:12:15 +02:00
tomas@poseidon.ndb.mysql.com
97a19c1b9b
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 22:54:49 +02:00
tomas@poseidon.ndb.mysql.com
5d67b05203
corrected merge error
2006-06-29 22:11:29 +02:00
tomas@poseidon.ndb.mysql.com
65cec4da00
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 21:07:07 +02:00
tomas@poseidon.ndb.mysql.com
6f318d1658
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-29 21:05:43 +02:00
tomas@poseidon.ndb.mysql.com
87460ec76a
Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
2006-06-29 20:55:21 +02:00
tomas@poseidon.ndb.mysql.com
dfce04fa67
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
2006-06-29 18:10:02 +02:00
joerg@mysql.com
7800da268a
Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/merge-5.0
2006-06-29 17:35:59 +02:00
joerg@mysql.com
6f6b966d16
Test "federated" failed because the log contains fixed port numbers.
...
Re-apply a patch by Knielsen in the 5.0.23 build clone: Replace port number by "SLAVE_PORT".
2006-06-29 17:00:48 +02:00
joerg@mysql.com
1054e8f66e
Increment the version number.
2006-06-29 16:38:14 +02: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
lars@mysql.com
f24851ee71
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
2006-06-29 15:15:21 +02: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
konstantin@mysql.com
5154bc6c47
A post-merge fix.
2006-06-29 16:31:08 +04:00
stewart@mysql.com
e343c0e214
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/4.1/main
2006-06-29 22:30:51 +10: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
lars@mysql.com
0707d4753f
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
2006-06-29 14:03:41 +02:00
stewart@mysql.com
4e59b43512
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
...
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-06-29 22:00:50 +10: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
jonas@perch.ndb.mysql.com
c6d9b5c551
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
2006-06-29 13:25:02 +02:00
tomas@poseidon.ndb.mysql.com
48de09a4dd
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:25:01 +02:00
tomas@poseidon.ndb.mysql.com
6df1090e80
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:03:09 +02:00
tomas@poseidon.ndb.mysql.com
0822e24679
fixed too small requestInfo in signal
...
+ adopted signal to be as close as possible to 5.1...
2006-06-29 13:01:54 +02:00
kroki@mysql.com
621a86ce82
Replace all numeric error code with symbolic names in trigger.test.
2006-06-29 13:45:43 +04:00
jonas@perch.ndb.mysql.com
f9822e7f6d
ndb - build
...
Fix compile error for forte
2006-06-29 11:39:07 +02:00
knielsen@mysql.com
c5abf0c700
Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.0
...
into mysql.com:/data0/knielsen/tmp-5.0
2006-06-29 10:38:50 +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
knielsen@mysql.com
dad0d8caca
Fix test files to work with non-standard ports (MTR_BUILD_THREAD).
2006-06-29 10:03:26 +02:00
gkodinov@mysql.com
3447374939
Merge mysql.com:/home/kgeorge/mysql/4.1/warnings
...
into mysql.com:/home/kgeorge/mysql/5.0/warnings
2006-06-29 10:46:30 +03:00
gkodinov@mysql.com
9dbb09182b
Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean
...
into mysql.com:/home/kgeorge/mysql/4.1/warnings
2006-06-29 10:36:08 +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
konstantin@mysql.com
55d148c5c2
A fix for Bug#19022 "Memory bug when switching db during trigger execution".
...
No test case as the bug is in an existing test case (rpl_trigger.test
when it is run under valgrind).
The warning was caused by memory corruption in replication slave: thd->db
was pointing at a stack address that was previously used by
sp_head::execute()::old_db. This happened because mysql_change_db
behaved differently in replication slave and did not make a copy of the
argument to assign to thd->db.
The solution is to always free the old value of thd->db and allocate a new
copy, regardless whether we're running in a replication slave or not.
2006-06-28 23:47:45 +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