Commit graph

57107 commits

Author SHA1 Message Date
Sergey Petrunia
79909a27eb Merge 2009-03-18 19:08:54 +03:00
Horst Hunger
c216de6e10 due to merge (pull) 2009-03-18 17:36:49 +01:00
Horst Hunger
ea24cef9b2 Due to bug#43733 I disabled "concurrent_innodb_(un)safelog.test" for embedded server. 2009-03-18 17:23:39 +01:00
Guangbao Ni
1a20ddfef5 Auto-merged from 5.1-bugteam 2009-03-18 15:19:28 +00:00
Guangbao Ni
647821432c Auto-merge from 5.1-bugteam 2009-03-18 15:02:06 +00:00
Bernt M. Johnsen
b011395bfa Bug#43329 prepared for commit on 5.0 2009-03-18 15:07:13 +01:00
Guangbao Ni
15d24779e1 Bug #42217 mysql.procs_priv does not get replicated
mysql.procs_priv table itself does not get replicated.
Inserting routine privilege record into mysql.procs_priv table
is triggered by creating function/procedure statements
according to current user's privileges.
Because the current user of SQL thread has GLOBAL_ACL,
which doesn't need any check mysql.procs_priv privilege
when create/alter/execute routines.
Corresponding GLOBAL_ACL privilege user
doesn't insert routine privilege record into
mysql.procs_priv when creating a routine.

Fixed by switching the current user of SQL thread to definer user if
the definer user exists on slave.
That populates procs_priv, otherwise to keep the SQL thread
user and procs_priv remains unchanged.
2009-03-18 13:48:23 +00:00
Tatiana A. Nurnberg
720f7ed651 auto-merge 2009-03-18 14:19:58 +01:00
Vladislav Vaintroub
e2ba86fb2c merge 2009-03-18 14:20:01 +01:00
Georgi Kodinov
0349dabf61 addendum to the 22047 fix : updated funcs_1 test suite 2009-03-18 14:52:31 +02:00
Chad MILLER
51e0a699a7 Using autoconf definitions instead of manually appending to CFLAGS is
smarter, and according to a contributer, it is necessary for plugin authors
using "--with-debug".
2009-03-18 08:49:05 -04:00
Bjorn Munch
1b922ca6e8 merge from main 2009-03-18 13:44:05 +01:00
Georgi Kodinov
56c0f724b3 merged 5.1-main -> 5.1-bugteam 2009-03-18 14:34:03 +02:00
Tatiana A. Nurnberg
333d4d6c4f auto-merge 2009-03-18 13:31:35 +01:00
Sergey Petrunia
962fce83cb Merge 2009-03-18 14:32:32 +03:00
Alfranio Correia
2f16f07054 Bug #42861 Assigning invalid directories to --slave-load-tmpdir crashes the slave
Compiling with debug and assigning an invalid directory to --slave-load-tmpdir
was crashing the slave due to the following assertion DBUG_ASSERT(! is_set() ||
can_overwrite_status). This assertion assumes that a thread can change its
state once (i.e. ok,error, etc) before aborting, cleaning/resuming or completing
its execution unless the overwrite flag (i.e. can_overwrite_status) is true.

The Append_block_log_event::do_apply_event which is responsible for creating
temporary file(s) was not cleaning the thread state. Thus a failure while
trying to create a file in an invalid temporary directory was causing the crash.

To fix the problem we check if the temporary directory is valid before starting
the SQL Thread and reset the thread state before creating a file in
Append_block_log_event::do_apply_event.
2009-03-18 10:31:17 +00:00
Alexey Kopytov
5315ffa7fa Automerge. 2009-03-18 11:35:52 +03:00
Alexey Kopytov
fefff5e496 Manual merge. 2009-03-18 11:27:49 +03:00
Alexey Kopytov
a3e5737abd Fix for bug#41486: extra character appears in BLOB for every
~40Mb after mysqldump/import 
        
When the input string exceeds the maximum allowed size for the 
internal buffer, batch_readline() returns a truncated string. 
Since there was no way for a caller to determine whether the 
string was truncated or not, the command line client assumed 
batch_readline() to always return the whole input string and 
appended a newline character. This resulted in garbled data 
when importing dumps containing strings longer than the 
maximum input buffer size. 
  
Fixed by adding a flag to the batch_readline() interface to 
signal a truncated string to the caller. 
  
Other minor problems fixed during patch implementation: 
 
- The maximum allowed buffer size for batch_readline() was set 
up depending on the client's max_allowed_packet value. It does 
not actully make any sense, as those variables are not 
related. The input buffer size limit is now always set to 1 
MB. 
  
- fill_buffer() did not always set the EOF flag. 
 
- The input buffer could actually grow twice as the specified 
limit due to insufficient checks in intern_read_line().
2009-03-18 11:18:24 +03:00
Satya B
079baf4c23 merge to 5.1-bugteam branch 2009-03-18 12:39:44 +05:30
Satya B
bbd694a3b0 Fix for BUG#32880 - Repairing Archive table fails with internal error 144
Any statement reading corrupt archive data file
(CHECK/REPAIR/SELECT/UPDATE/DELETE) may cause assertion
failure in debug builds. This assertion has been removed
and an error is returned instead.

Also fixed that CHECK/REPAIR returns vague error message
when it mets corruption in archive data file. This is
fixed by returning proper error code.
2009-03-18 11:16:21 +05:30
Leonard Zhou
dd016b9829 Merge 2009-03-18 11:05:48 +08:00
Vladislav Vaintroub
41746bb039 Bug #43715 Link errors when trying to link mysql_embedded.exe
The reason for the error is incorrectly specified link dependencies
for mysql_embedded, mysqltest_embedded and mysql_client_test_embedded
in CMakeLists.txt (ADD_DEPENDENCIES should be TARGET_LINK_LIBRARIES)
2009-03-17 23:28:24 +01:00
Ignacio Galarza
428e28e00c auto-merge 2009-03-17 16:29:24 -04:00
Tatiana A. Nurnberg
061b5d6523 auto-merge 2009-03-17 18:38:04 +01:00
Tatiana A. Nurnberg
6efe0c341d 36446: fix Windows warning 2009-03-17 18:24:35 +01:00
Georgi Kodinov
49c6e74746 merge 5.0-bugteam -> 5.1-bugteam 2009-03-17 16:33:54 +02:00
Georgi Kodinov
799551a4c3 auto-merge 2009-03-17 16:32:44 +02:00
Georgi Kodinov
7af84377cc Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to
become negative

- merged the fix to 5.1
- extended to cover I_S.PROCESSLIST.TIME
- Changed the column type of I_S.PROCESSLIST.TIME from LOGNLONG
  UNSIGNED
  to LONG (to match the SHOW PROCESSLIST type)
- Added a test case
2009-03-17 16:29:16 +02:00
Georgi Kodinov
718efce059 merged 5.0-bugteam -> bug 22047 2009-03-17 16:28:05 +02:00
Horst Hunger
e9c874224b Fix for bug 39484 after review. I inserted the review results (also including the patches itself):
"Release_lock("hello")" is now also successful when delivering NULL, replaced two sleeps by wait_condition. The last two "sleep 1" have not been replaced as all tried wait conditions leaded to nondeterministic results, especially to succeeding concurrent updates. To replace the sleeps there should be some time planned (or internal knowledge of the server may help).
2009-03-17 14:43:43 +01:00
Tatiana A. Nurnberg
bacb0357c9 auto-merge 2009-03-17 08:59:07 +01:00
Ramil Kalimullin
7178e47a3c Code clean-up. 2009-03-17 11:04:15 +04:00
Patrick Crews
c86055b325 Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
Re-recording of .result files for additional tests that use this include file.
2009-03-16 17:36:14 -04:00
Tatiana A. Nurnberg
05269b7b05 automerge 2009-03-16 21:21:10 +01:00
Tatiana A. Nurnberg
2849db95fc manual merge 2009-03-16 20:54:50 +01:00
Sergey Petrunia
ae3a1b8c06 Fix wrong parameter name which caused compile failure on windows 2009-03-16 20:45:03 +03:00
Sergey Petrunia
9782169b29 Merge 2009-03-16 20:10:03 +03:00
Sergey Petrunia
64603af1b9 @@optimizer_switch switch from no_xxx to xxx={on|off} syntax:
- Fix valgrind warning on attempt to run a "SET optimizer_switch=number" statement.
  Need to call c_ptr_safe() as strings returned by non-string items are not 
  necessarily null-terminated.
2009-03-16 20:02:55 +03:00
Patrick Crews
bfcfbbbc32 merge 2009-03-16 12:35:32 -04:00
Tatiana A. Nurnberg
611a09f596 Bug#36446: Attempt to set @@join_buffer_size to its minimum value produces spurious warning
If a sys-var has a base and a block-size>1, and then a
user-supplied value >= minimum ended up below minimum
thanks to block-size alignment, we threw a warning.
This meant for instance that when getting, then setting
the minimum, we'd see a warning. This was needlessly
confusing. (updated patch)
2009-03-16 16:11:45 +01:00
Alexey Kopytov
b00996e85f Manual merge of patch for bug #40552 into the team tree.
Replaced a call to load_defaults() in sql_plugin.cc with 
its thread-safe version.
2009-03-16 13:37:13 +03:00
Leonard Zhou
b843ea8bf8 Merge 2009-03-16 17:06:22 +08:00
Alexey Kopytov
a6da1b4a38 Automerge. 2009-03-19 10:15:08 +03:00
Chad MILLER
078a9762ad Merge bugteam and fix for 42675. 2009-03-18 18:38:30 -04:00
Chad MILLER
5ac1f353e1 Merge fix for 39326 and bugteam tree. 2009-03-18 15:16:48 -04:00
Alexey Kopytov
4d36f9967f Automerge. 2009-03-18 16:43:42 +03:00
Alexey Kopytov
083e77acd3 Automerge. 2009-03-18 16:32:43 +03:00
Alexey Kopytov
f253c54421 Automerge. 2009-03-18 11:38:34 +03:00
Alexey Kopytov
a0dd40a21c Automerge. 2009-03-18 11:36:48 +03:00