Commit graph

55214 commits

Author SHA1 Message Date
Horst Hunger
6fce714652 Fix for bug#37702: Inserted the review results into the patch. 2008-11-26 09:33:41 +01:00
Ingo Struewing
9300f20d21 merge 2008-11-25 12:03:02 +01:00
Ramil Kalimullin
f9206079df Null-merge of backport for #40984. 2008-11-25 13:55:30 +04:00
Ingo Struewing
6b2c6a125c merge 2008-11-25 09:29:58 +01:00
Ingo Struewing
ebfad22d0c merge 2008-11-25 09:27:40 +01:00
Ramil Kalimullin
03a27c45cd Fix for bug#40984: backport fix from 39585 into 5.0
Problem: in 5.0 'check table for upgrade' doesn't detect
incompatible collation changes made in 5.0.48.

Fix: backport #39585 fix to 5.0
2008-11-25 10:22:02 +04:00
Mattias Jonsson
f11b5d4c63 merge 2008-11-24 23:18:45 +01:00
Patrick Crews
09e1f238e4 Merge 5.0->5.1 2008-11-24 16:56:48 -05:00
Patrick Crews
6d31576682 Bug#40866: mysql-test-run's check of tests provides false failures due to timestamp
Altering how MTR checks global variable status to exclude timestamp
Changed SQL statements to update style.
2008-11-24 16:53:32 -05:00
Mattias Jonsson
26a916ff36 Bug#40954: Crash in MyISAM index code with concurrency test using partitioned tables
Problem was usage of read_range_first with an empty key.

Solution was to not to give a key if it was empty.
2008-11-24 17:24:03 +01:00
Georgi Kodinov
9eec8375f6 merged bug 39656 to 5.1-bugteam 2008-11-24 18:00:09 +02:00
Georgi Kodinov
8dabe40247 merged bug 39656 to 5.0-bugteam 2008-11-24 17:38:52 +02:00
Georgi Kodinov
f0d5f30ccf Bug #39656: Behaviour different for agg functions with & without where -
ONLY_FULL_GROUP_BY

The check for non-aggregated columns in queries with aggregate function, but without
GROUP BY was treating all the parts of the query as if they are in the SELECT list.
Fixed by ignoring the non-aggregated fields in the WHERE clause.
2008-11-24 17:30:47 +02:00
Vladislav Vaintroub
042b9c30df merge 2008-11-22 01:22:20 +01:00
Vladislav Vaintroub
286d73c3e9 merge 2008-11-22 01:10:38 +01:00
Ingo Struewing
3ea684935b Bug#28234 - global/session scope - documentation vs implementation
Several system variables did not behave like system variables should do.
When trying to SET them or use them in SELECT, they were reported as
"unknown system variable". But they appeared in SHOW VARIABLES.

This has been fixed by removing the "fixed_vars" array of variables
and integrating the variables into the normal system variables chain.
All of these variables do now behave as read-only global-only
variables. Trying to SET them tells they are read-only, trying to
SELECT the session value tells they are global only. Selecting the
global value works. It delivers the same value as SHOW VARIABLES.
2008-11-22 00:22:21 +01:00
Horst Hunger
20b6f563dc Due to merges. 2008-11-21 17:36:18 +01:00
Horst Hunger
e886b712f5 Fix for bug#36873 containing the review results. 2008-11-21 15:36:13 +01:00
Alexey Botchkov
ac1ca6b9ca warning of notused function fixed 2008-11-21 18:15:11 +04:00
Ramil Kalimullin
5a8fd4a3ce Auto-merge 2008-11-21 17:32:45 +04:00
Ramil Kalimullin
ca31fa3591 Auto-merge 2008-11-21 17:20:58 +04:00
Sergey Glukhov
30b795dfcb null merge 2008-11-21 16:43:06 +04:00
Sergey Glukhov
a72c980c74 Bug#34760 Character set autodetection appears to fail
the problem is the same as reported in bug#20835,
so the fix is backport of bug#20835 patch.
2008-11-21 16:39:59 +04:00
Vladislav Vaintroub
d0eae54036 Fix broken link in embedded server (Windows) 2008-11-21 11:15:26 +01:00
Ramil Kalimullin
a78629c40c Fix for bug#36772: When using UTF8, CONVERT with GROUP BY
returns truncated results

Problem: performig conversion from {INT, DECIMAL, REAL} to CHAR
we incorrectly set its max length in some cases that may lead
to truncated results returned.

Fix: properly set CONVERT({INT, DECIMAL, REAL}, CHAR) result's
max length.
2008-11-21 13:48:22 +04:00
Vladislav Vaintroub
2928ebc464 merge 2008-11-21 10:00:21 +01:00
Chad MILLER
91684ef0a0 Merge update for bug 39178 fix. 2008-11-20 09:58:30 -05:00
Chad MILLER
d53d88b074 Update to change for bug 39178. Revert error-handling change, perhaps
temporarily if yassl maintainer has plans for other error handling.
2008-11-20 09:51:01 -05:00
Ramil Kalimullin
0b28a456ff Fix for bug#40770: Server Crash when running with triggers including
variable settings (rpl_sys)

Problem: under certain conditions (e.g. user variables usage in triggers)
accessing a user defined variable we may use a variables hash table that
belongs to already deleted thread. It happens if
thd= new THD;
has the same address as just deleted thd as we use
if (stored_thd == thd)
to check.
That may lead to unpredictable results, server crash etc.

Fix: use thread_id instead of thd address to distinguish threads.

Note: no simple and repeatable test case.
2008-11-20 15:25:26 +04:00
Ramil Kalimullin
f7df5c982c Null-merge 2008-11-20 14:51:38 +04:00
Ramil Kalimullin
240d0633b3 Fix for bug#40875: Memory leak in FEDERATED handler
Problem: memory leak occurs when we open a federated table
that has its share in the hash.

Fix: free not used memory.

Note: the fix should NOT be merged to 5.1 (the code changed).
2008-11-20 14:08:36 +04:00
Staale Smedseng
e60c8c8b68 A fix for Bug#22891 "session level max_allowed_packet can be
set but is ignored".
                                  
This patch makes @@session.max_allowed_packed and
@@session.net_buffer_length read-only as suggested in the bug
report. The user will have to use SET GLOBAL (and reconnect)
to alter the session values of these variables.
                            
The error string ER_VARIABLE_IS_READONLY is introduced.
                            
Tests are modified accordingly.
2008-11-20 08:51:48 +01:00
Vladislav Vaintroub
7d5e156c78 Bug#39494 : key_buffer_size > 4GB does not work on 64 bit Windows
Cache size  is truncated via 32bit ulong  in  ha_init_key_cache() and 
ha_resize_key_cache() 

This change fixes the cast to size_t instead of ulong. This cast is safe,
because key_buffer_size parameter is limited to SIZE_T_MAX
2008-11-19 16:02:38 +01:00
Alexey Botchkov
b8cd1725b1 Bug#38293 Libmysqld crash in mysql_library_init if language file missing
additional fix - the 'debug' keyword removed
2008-11-19 15:51:31 +04:00
Alexey Botchkov
a24dce13c6 merging 2008-11-19 14:01:21 +04:00
Alexey Botchkov
70e8a4fd54 Bug#38293 Libmysqld crash in mysql_library_init if language file missing
That's a Win-specific error.
    When we create libmysqld.dll we have many libraries like mysys, dbug,
    strings, etc linked into that dll, so the application built upon
    this library shouldn't link these libraries to itself, rather use
    those inside the dll.

    Fixed by redirecting calls into the libmysqld.dll

per-file comments:
  dbug/dbug.c
Bug#38293 Libmysqld crash in mysql_library_init if language file missing
    fake _db_something definitions added

  include/my_dbug.h
Bug#38293 Libmysqld crash in mysql_library_init if language file missing
  fake _db_something declarations added

  libmysqld/examples/CMakeLists.txt
Bug#38293 Libmysqld crash in mysql_library_init if language file missing
    superfluous libraries removed from linking

  libmysqld/libmysqld.def
Bug#38293 Libmysqld crash in mysql_library_init if language file missing
    set of mysys functions added to the export section
2008-11-19 13:57:23 +04:00
Alexey Botchkov
63b02e2b07 merging 2008-11-19 13:29:45 +04:00
Chad MILLER
a6fb36d46e Merge fix for bug 39178. 2008-11-18 12:04:36 -05:00
Chad MILLER
918a8c469f Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \
using crashes server

When the server is configured to use a RSA key, and when the client sends
a cipher-suite list that contains a non-RSA key as acceptable, the server 
would try to process that key even though it was impossible.

Now, yaSSL sets its own acceptable-cipher list according to what kind of
key the server is started with, and will never explore and try to pair 
impossible combinations.

This involves a partial import of the current YaSSL tree, not the whole
thing, so as to try to avoid introducing new bugs.

(Updated to avoid many whitespace changes and make diff smaller.)
2008-11-18 11:45:44 -05:00
Sergey Vojtovich
c411255507 Merge. 2008-11-18 15:38:28 +04:00
Sergey Vojtovich
0001121ccb Merge. 2008-11-18 15:10:52 +04:00
Alexey Botchkov
631d21499f merging 2008-11-18 14:17:46 +04:00
Kristofer Pettersson
1125dfd67f Automerge 2008-11-18 12:33:38 +01:00
Alexey Botchkov
d5f4fcb6c8 merging 2008-11-18 13:52:03 +04:00
Alexey Botchkov
58701cae11 Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
GLOBAL STATUS is calculated by studying the list of threads. In the
        embedded server threads were not linked to the internal list, so the
        calculation always returns 0. Fixed by 'linking' the embedded-server
        threads to the same list

per-file comments:
  libmysqld/lib_sql.cc
Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
    Add newly created 'threads' to the internal thread list.
    Remove them from the list as they're freed.

  mysql-test/r/information_schema.result
Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
    test result

  mysql-test/t/information_schema.test
Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.
    test case added
2008-11-17 20:06:03 +04:00
Alexey Botchkov
ef3600b80b merging 2008-11-17 19:43:10 +04:00
Alexey Botchkov
56dc6b2ecd Bug#31616 div_precision_increment description looks wrong
Item_func_div didn't calculate the precision of the result properly.
  The result of 5/0.0001 is 5000 so we have to add decimals of the divisor
  to the planned precision.

per-file comments:
  mysql-test/r/type_newdecimal.result
Bug#31616 div_precision_increment description looks wrong
    test result fixed

  mysql-test/t/type_newdecimal.test
Bug#31616 div_precision_increment description looks wrong
    test case

  sql/item_func.cc
Bug#31616 div_precision_increment description looks wrong
    precision must be increased with args[1]->decimals parameter
2008-11-17 19:41:09 +04:00
Kristofer Pettersson
b3bb760c1d Automerge 2008-11-17 15:22:29 +01:00
Kristofer Pettersson
11493dfde4 Bug#40778 thd_security_context has bad architecture; allocates on unprotected memroot
The function thd_security_context allocates memory on an unprotected MEM_ROOT if the
message length becomes longer than requested and the initial buffer memory needs to
be reallocated.
                  
This patch fixes the design error by copying parts of the reallocated buffer 
to the destination buffer. This works because the destination buffer isn't
owned by the String object and thus isn't freed when a new buffer is allocated.
Any new memory allocated by the String object is reclaimed when the object
is destroyed at the end of the function call.
2008-11-17 15:17:21 +01:00
Mattias Jonsson
93f88cb908 merge 2008-11-15 00:26:48 +01:00