Commit graph

58721 commits

Author SHA1 Message Date
Georgi Kodinov
c723e3dfeb merge 2009-11-27 16:41:45 +02:00
Georgi Kodinov
304a7095fe added the missing remove of the temp file 2009-11-27 16:36:22 +02:00
Georgi Kodinov
0213f82052 merge 2009-11-27 16:20:02 +02:00
Georgi Kodinov
ef3f5d31f6 merge 2009-11-27 16:17:24 +02:00
Sergey Vojtovich
69126af305 Fixes for bug47671.test:
- embedded server doesn't support external clients
- removed unnecessary command line options
2009-11-27 17:55:08 +04:00
Georgi Kodinov
73cb06f004 Addendum to Bug #27884: fixed test incompatibility on windows. 2009-11-27 15:46:54 +02:00
Georgi Kodinov
96ffcff059 merge 2009-11-27 12:32:15 +02:00
Georgi Kodinov
0ed9d7e76c Bug #48872 : Privileges for stored functions ignored if function name
is mixed case

Transcode the procedure name to lowercase when searching for it in the 
hash. This is the missing part of the fix for bug #41049.
2009-11-27 11:59:44 +02:00
Kent Boortz
f343afe02b Merge 2009-11-27 09:35:11 +01:00
Martin Hansson
fa61292476 Merge of fix for Bug#48459 2009-11-26 10:41:40 +01:00
Satya B
8e53e7e415 merge to mysql-5.1-bugteam 2009-11-26 13:12:16 +05:30
Kent Boortz
ea19feebda Move DBG_* macros to after the variable declaration section in a
block, might expand to function calls (Bug#48331)
2009-11-25 16:48:29 +01:00
Davi Arnaut
40767bf54a Automerge. 2009-11-25 11:09:12 -02:00
Satya B
8f0b162aae NULL Merge Innodb snapshot 5.0-ss6230 to 5.1-bugteam 2009-11-25 15:34:19 +05:30
Martin Hansson
185e24d592 Bug#48459: valgrind errors with query using 'Range checked
for each record'

There was an error in an internal structure in the range
optimizer (SEL_ARG). Bad design causes parts of a data
structure not to be initialized when it is in a certain
state. All client code must check that this state is not
present before trying to access the structure's data. Fixed
by

- Checking the state before trying to access data (in
several places, most of which not covered by test case.)

- Copying the keypart id when cloning SEL_ARGs
2009-11-25 11:02:25 +01:00
Satya B
e2afa05e2a Applying InnoDB snapshot 5.0-ss6230, part 2. Fixes BUG#46000
BUG#46000 - using index called GEN_CLUST_INDEX crashes server

Detailed revision comments:

r6180 | jyang | 2009-11-17 10:54:57 +0200 (Tue, 17 Nov 2009) | 7 lines
branches/5.0: Merge/Port fix for bug #46000 from branches/5.1
-r5895 to branches/5.0. Disallow creating index with the
name of "GEN_CLUST_INDEX" which is reserved for the default
system primary index. Minor adjusts on table name screening
format for added tests.
2009-11-25 15:29:25 +05:30
Evgeny Potemkin
a23cc5f1d4 Auto-merge. 2009-11-25 12:57:08 +03:00
Evgeny Potemkin
28b54d144d Additional fix for the bug#43668.
Arg_comparator now takes into account that some of
optimizations aren't done in the PREPARE stmt.
2009-11-25 12:52:03 +03:00
Satya B
0dd5eaa51e Applying InnoDB snapshot 5.0-ss6230, Part 1. Fixes BUG#47777
BUG#47777 - innodb dies with spatial pk: Failing assertion: buf <= original_buf + buf_len

Detailed revision comments:

r6178 | jyang | 2009-11-17 08:52:11 +0200 (Tue, 17 Nov 2009) | 6 lines
branches/5.0: Merge fix for bug #47777 from branches/5.1 -r6045
to bracnches/5.0. Treat the Geometry data same as Binary BLOB
in ha_innobase::store_key_val_for_row(), since the Geometry
data is stored as Binary BLOB in Innodb.
2009-11-25 15:08:52 +05:30
Satya B
dacd32f955 Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39
mysql client displays wrong character-set of server. When a user changes the
charset of a server, mysql client 'status' command displays wrong charset but
the command "SHOW VARIABLES LIKE "%charset%" displayed correct charset results.
The problem is only with the mysql client's 'status' command output.

In mysql client, the method mysql_store_lazy_result() returns 0 for
success and non-zero for failure. The method com_status() was using this method
wrongly. Fixed all such instances according to return value of the method 
mysql_store_lazy_result().
2009-11-25 12:25:49 +05:30
Tatiana A. Nurnberg
a8207fae74 auto-merge 2009-11-24 17:43:51 -08:00
Davi Arnaut
ec3e44778d Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 and up. 2009-11-24 19:25:23 -02:00
Tatiana A. Nurnberg
2145c866c5 auto-merge 2009-11-24 10:22:22 -08:00
Tatiana A. Nurnberg
7d00a27fc2 auto-merge 2009-11-24 09:23:51 -08:00
Tatiana A. Nurnberg
0abb82b9e5 auto-merge 2009-11-24 08:08:47 -08:00
Evgeny Potemkin
982bfdb0c8 Auto-merge. 2009-11-24 18:30:21 +03:00
Evgeny Potemkin
438b795ff7 Manual merge of the fix for bug#43668. 2009-11-24 18:26:13 +03:00
Jim Winstead
049dc018da Null-merge of backported bug fix. 2009-11-23 14:46:25 -08:00
Jim Winstead
531d32a5bb Backport fix for Bug #27884. 2009-11-23 14:38:08 -08:00
Georgi Kodinov
b75392782c Additional fix for bug #45613: handle failures from my_hash_insert
Testing for presence of stuff in a hash inside the function
that's filling in the hash creates chicken-and-egg type of problems.
This results in test suite failures in mysql-pe in debug mode and 
adds bad initialization dependency in 5.1.
Fixed by removing the debug code.
2009-11-23 17:32:10 +02:00
Alexey Kopytov
0e35382391 Automerge. 2009-11-23 13:07:58 +03:00
Alexey Kopytov
2bbae9383e Automerge. 2009-11-23 13:07:18 +03:00
Alexey Kopytov
cba6be7135 Automerge. 2009-11-23 13:05:35 +03:00
Alexey Kopytov
eaf20c303f Automerge. 2009-11-23 13:04:17 +03:00
7f7dabb017 Bug #48350 truncate temporary table crashes replication
In RBR, All statements operating on temporary tables should not be binlogged.
Despite this fact, after executing 'TRUNCATE... ' on a temporary table, 
the command is still logged, even if in row-based mode. Consequently, this raises
problems in the slave as the table may not exist, resulting in an
execution failure. Ultimately, this causes the slave to report
an error and abort.

After this patch, 'TRUNCATE ...' statement on a temporary table will not be
binlogged in RBR.
2009-11-22 13:10:33 +08:00
Alfranio Correia
7c9503b75e merge 5.1-bugteam (local) --> 5.1-bugteam 2009-11-21 13:02:18 +00:00
Davi Arnaut
0b87650887 Post-merge fixes: fix typo and remove unused variables. 2009-11-21 10:11:45 -02:00
Davi Arnaut
3fe5cd80ae Bug#41726: upgrade from 5.0 to 5.1.30 crashes if you didn't run mysql_upgrade
The problem is that the server could crash when attempting
to access a non-conformant proc system table. One such case
was a crash when invoking stored procedure related statements
on a 5.1 server with a proc system table in the 5.0 format.

The solution is to validate the proc system table format
before attempts to access it are made. If the table is not
in the format that the server expects, a message is written
to the error log and the statement that caused the table to
be accessed fails.
2009-11-21 09:18:21 -02:00
Kristofer Pettersson
8e80deb52f merge 2009-11-20 21:56:43 +01:00
Kristofer Pettersson
762d5cf10e automerge 2009-11-20 16:24:48 +01:00
Kristofer Pettersson
3771d623b1 Bug#45613 handle failures from my_hash_insert
Not all my_hash_insert() calls are checked for return value.

This patch adds appropriate checks and failure responses
where needed.
2009-11-20 16:18:01 +01:00
Georgi Kodinov
91c9bdad60 merge 2009-11-20 15:41:09 +02:00
Georgi Kodinov
fe9341129b merge 2009-11-20 15:39:15 +02:00
Georgi Kodinov
8a69ff07f4 merge 2009-11-20 15:38:21 +02:00
Vladislav Vaintroub
5dbb9bef75 merge 2009-11-20 14:20:01 +01:00
Kristofer Pettersson
26b55a3ab6 automerge 2009-11-20 13:57:31 +01:00
Kristofer Pettersson
c9b5710e7c Bug#39253 Large query cache still freezes server after fix for bug #21074
This patch introduce a limit on the time the query cache can
block with a lock on SELECTs.

Other operations which causes a change in the table
data will still be blocked.
2009-11-20 13:49:06 +01:00
Georgi Kodinov
ef564a3759 merge 2009-11-20 14:48:15 +02:00
Vladislav Vaintroub
78da734345 Bug#47571 : idle named pipe connection is unkillable
implement Davi's review suggestions (post-push fixes)
2009-11-20 13:09:50 +01:00
Georgi Kodinov
2942ace6bb merge 2009-11-20 12:11:31 +02:00