Commit graph

36056 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
019532a544 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-29 13:26:39 +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
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
joerg@mysql.com
dcc67c0080 Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516). 2006-06-29 11:59:05 +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
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
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
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
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
evgen@moonbone.local
3ad6ad75e1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into moonbone.local:/home/evgen/mysql-5.1-new
2006-06-28 21:51:19 +04:00
acurtis@ltamd64.xiphis.org
1ac3bcca72 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  xiphis.org:/home/antony/work2/mysql-5.1-engines.sync
2006-06-28 10:39:17 -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
monty@narttu.mysql.fi
91c3e28d77 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
acurtis@ltamd64.xiphis.org
9d99e180f5 Merge xiphis.org:/home/antony/work2/p4-bug12096.3
into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge
2006-06-28 10:02:47 -07:00
ingo@mysql.com
99ad23ec7c Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
It was possible that fetching a record by an exact key value 
(including the record pointer) could return a record with a 
different key value. This happened only if a concurrent insert 
added a record with the searched key value after the fetching 
statement locked the table for read.

The search succeded on the key value, but the record was
rejected as it was past the file length that was remembered
at start of the fetching statement. With other words it was 
rejected as being a concurrently inserted record.

The action to recover from this problem was to fetch the 
record that is pointed at by the next key of the index. 
This was repeated until a record below the file length was 
found.

I do now avoid this loop if an exact match was searched. 
If this match is beyond the file length, it is now treated 
as "key not found". There cannot be another key with the 
same record pointer.
2006-06-28 18:55:30 +02:00
acurtis@xiphis.org
f242546e85 Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into  xiphis.org:/home/antony/work2/p4-bug12096.2-merge
2006-06-28 09:54:40 -07:00
evgen@moonbone.local
82369c4e65 Manual merge 2006-06-28 19:34:04 +04:00
tomas@poseidon.ndb.mysql.com
470087cb58 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-28 17:20:01 +02:00
tomas@poseidon.ndb.mysql.com
63c72dc02b 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-28 17:12:18 +02:00
lars@dl145k.mysql.com
315ae8f4cc Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-28 16:56:15 +02:00
lars@dl145k.mysql.com
d4f7943594 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-28 16:44:54 +02:00
monty@mysql.com
500dd048b9 Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex" 2006-06-28 17:23:54 +03:00
lars@mysql.com
6036c30b57 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-06-28 16:18:57 +02:00
ingo@mysql.com
9dd5bc3843 Bug#19835 - Binary copy of corrupted tables crash the server when issuing a query
A corrupt table with dynamic record format can crash the 
server when trying to select from it.
        
I fixed the crash that resulted from the particular type 
of corruption that has been reported for this bug.

No test case. To test it, one needs a table with a very special
corruption. The bug report contains a file with such a table.
2006-06-28 16:07:39 +02:00
lars@dl145k.mysql.com
00fc05ff1b Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-06-28 15:34:09 +02:00
gkodinov@mysql.com
96ceb6c234 gcc 4.1 linux warning fixes backported from 5.0. 2006-06-28 16:28:29 +03:00
lars@mysql.com
c75584d8d9 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
2006-06-28 15:27:25 +02:00
knielsen@mysql.com
10abc3e244 BUG#20739.
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
2006-06-28 15:15:49 +02:00
lars@mysql.com
38501d8804 Disabled test case for Windows (BUG#20753) 2006-06-28 15:07:41 +02:00
gkodinov@mysql.com
2cda7f5d80 4.1->5.0 merge for bug #16458 2006-06-28 15:53:54 +03:00
stewart@willster.(none)
1cc537d9fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.1/bug20725
2006-06-28 22:47:25 +10:00
ingo@mysql.com
d8499f2d8f Bug#17877 - Corrupted spatial index
CHECK TABLE could complain about a fully intact spatial index.
A wrong comparison operator was used for table checking. 
The result was that it checked for non-matching spatial keys. 
This succeeded if at least two different keys were present, 
but failed if only the matching key was present.

I fixed the key comparison.
2006-06-28 14:27:37 +02:00
stewart@mysql.com
11c38b0f9e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge
2006-06-28 22:25:41 +10:00
knielsen@mysql.com
e8df7d43a5 BUG#20739
Improved definition of mysys configuration for -nt builds.
2006-06-28 14:25:17 +02:00
stewart@mysql.com
30b08617fc Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge
2006-06-28 22:21:42 +10:00
stewart@willster.(none)
c19578fbfd Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 22:16:04 +10:00
stewart@willster.(none)
e5567d8402 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
2006-06-28 22:06:26 +10:00