Commit graph

56730 commits

Author SHA1 Message Date
Patrick Crews
1c39d5ff8f Fix of failing funcs_1 tests.
Changes are due to changes in precision.
Re-record of .result files to account for new server precision.
2009-03-09 11:32:07 -04:00
Tatiana A. Nurnberg
eb330039ad automerge 2009-03-09 15:57:34 +01:00
Tatiana A. Nurnberg
dec80f3ee5 Bug#40657: assertion with out of range variables and traditional sql_mode
test-fixes for 32-bit
2009-03-09 15:26:53 +01:00
Georgi Kodinov
abdd2fe67a set the tree name to 5.0-main 2009-03-09 15:59:22 +02:00
Bjorn Munch
8179ed2649 Bug #43410 --skip-core-file has no effect if core file size is set
Would not prevent mysqld from core dumping
Passes --nocore arg to safe_process, which then sets rlimit core to 0 for child
2009-03-09 14:31:39 +01:00
Bjorn Munch
739d5775b1 Bug #43148 MTR2 + PB2 should display correct number of failures
Retried tests are reported the same as ordinary ones
Prepend "retry-" to fail or pass for retried tests
2009-03-09 12:59:34 +01:00
Georgi Kodinov
4976ec08a3 merge 5.0-pe-stage -> 5.1-pe-stage 2009-03-09 13:15:46 +02:00
Georgi Kodinov
93a58abe87 merged 5.1-main -> 5.1-pe-stage 2009-03-09 12:52:08 +02:00
Georgi Kodinov
df0fc2ea6a fixed a typo 2009-03-09 12:49:18 +02:00
Daniel Fischer
a732b40951 merge from parent 2009-03-09 11:33:08 +01:00
Georgi Kodinov
9870864a88 fixed a win32 compile warning 2009-03-09 12:22:52 +02:00
Daniel Fischer
6c0308f6b7 merge 42888 to 5.1-mtr 2009-03-09 11:11:27 +01:00
Anurag Shekhar
9eba69618d fixing warning during compilation. 2009-03-09 15:03:02 +05:30
He Zhenxing
6ddec9a50b Auto merge 2009-03-09 16:44:18 +08:00
He Zhenxing
ea7a84bf7e Auto merge 2009-03-09 16:42:31 +08:00
Anurag Shekhar
fa0b8098f3 merging with latest changes. 2009-03-09 13:58:48 +05:30
Bjorn Munch
affe300a48 merge from 5.1 main 2009-03-07 20:42:11 +01:00
Andrei Elkin
f36a37af7b Bug #40559 assertion failed in check_binlog_magic
The reason of the bug is in that the test makes a trick with relay log files and
did not reset fully at the end.
If mtr does not restart the test the new SQL thread tried to work with the old time
session data.

Fixed with deploying RESET slave at the clean-up.
2009-03-06 20:19:29 +02:00
Tatiana A. Nurnberg
6d5ccfa1f2 manual merge 2009-03-06 16:11:34 +01:00
Matthias Leich
e7004ec5ef Merge 5.0 -> 5.1 of fix for Bug#42003 and Bug#43114 2009-03-06 15:56:17 +01:00
Kristofer Pettersson
d6634f461b Manual merge 2009-03-06 11:49:39 +01:00
He Zhenxing
4cef9cc026 Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam 2009-03-06 17:38:14 +08:00
He Zhenxing
c8532bc979 Auto merge 2009-03-06 17:34:47 +08:00
He Zhenxing
e7605e338b BUG#22082 Slave hangs(holds mutex) on "disk full"
When disk is full, server may waiting for free space while
writing binlog, relay-log or MyISAM tables. The server will 
continue after user have freed some space. But the error
message printed was not quite clear about the how often the
error message is printed, and there will be a delay before
the server continue and user freeing space. And caused users
thinking that the server was hanging forever.

This patch fixed the problem by making the error messages
printed more clear. The error message is split into two part,
the first part will only be printed once, and the second part
will be printed very 10 times.

Message first part:
Disk is full writing '<filename>' (Errcode: <errorno>). Waiting
for someone to free space... (Expect up to 60 secs delay for 
server to continue after freeing disk space)

Message second part:
Retry in 60 secs, Message reprinted in 600 secs
2009-03-06 17:32:00 +08:00
Luis Soares
5d5f0fcd47 BUG#39753: Replication failure on MIXED + bit + myisam + no PK
When using mixed mode the record values stored inside the storage
engine differed from the ones computed from the row event. This
happened because the prepare_record function was calling
empty_record macro causing some don't care bits to be left set.
                          
Replacing the empty_record plus explicitly setting defaults with 
restore_record to restore the record default values fixes this.
2009-03-05 20:54:53 +01:00
Tatiana A. Nurnberg
38a9c269b5 Bug#40657: assertion with out of range variables and traditional sql_mode
Some changes that make things more elegant in 6.0,
backported so the code is mostly the same in 5.1,
for easier maintainence.
2009-03-05 16:42:12 +01:00
Matthias Leich
7c4e55cb8a Merge of fix for Bug#42003 and Bug#43114 into more actual GCA tree
modifications according to the reviews are included
2009-03-05 14:35:03 +01:00
Sergey Glukhov
a95cd5a3af removed unused variable 2009-03-05 17:23:16 +04:00
Kristofer Pettersson
76a5891429 Bug#40363 Bug 20023 is not fixed on 5.0
This is a back port from 5.1 to 5.0.

Fix for BUG 20023: mysql_change_user() resets the value
of SQL_BIG_SELECTS.
  
The bug was that SQL_BIG_SELECTS was not properly set
in COM_CHANGE_USER.
  
The fix is to update SQL_BIG_SELECTS properly.
2009-03-05 13:37:46 +01:00
Sergey Glukhov
e244dd2065 automerge 2009-03-05 15:58:04 +04:00
Guangbao Ni
3383844cc5 Auto merged 2009-03-05 19:01:46 +00:00
Guangbao Ni
58dfaa8b67 BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 !
When binlog_format is STATEMENT and the statement is unsafe before,
the unsafe warning/error message was issued without checking
whether the SQL_LOG_BIN was turned on or not.
      
Fixed with adding a sql_log_bin_toplevel flag in THD to check
whether SQL_LOG_BIN is ON in current session whatever the current is in sp or not.
2009-03-05 18:39:02 +00:00
Sergey Glukhov
3fac11b907 Bug#41030 Wrong meta data (incorrect fieldlen)
set user variable max length on
fix_length_and_dec() stage
using real value length.
2009-03-05 15:34:02 +04:00
Davi Arnaut
71c12404e9 Bug#41465: confusing error message when comment is too long
The problem was that the server was trying to use the unknown
error format string (ER_UNKNOWN_ERROR) to print messages about
comments being too long, but the said format string does not
accept arguments and will always default to "Unknown error".

The solution is to introduce new error messages which are
specific to the error conditions so that server wants to
signal -- this also means that it's possible to translate
those messages.
2009-03-05 08:20:01 -03:00
Kristofer Pettersson
be97f31b78 merge 5.0->5.1 2009-03-06 11:19:02 +01:00
Kristofer Pettersson
92b3462bea Automerge 2009-03-06 10:52:43 +01:00
Narayanan V
c883cc8698 merging with mysql-5.1-bugteam tree 2009-03-06 10:45:46 +05:30
Kristofer Pettersson
b340cf63fd Automerge 2009-03-05 15:30:59 +01:00
Kristofer Pettersson
1634777203 Bug#39843 DELETE requires write access to table in subquery in where clause
An unnecessarily restrictive lock were taken on sub-SELECTs during DELETE.

During parsing, a global structure is reused for sub-SELECTs and the attribute
keeping track of lock options were not reset properly.
This patch introduces a new attribute to keep track on the syntactical lock
option elements found in a sub-SELECT and then sets the lock options accordingly.

Now the sub-SELECTs will try to acquire a READ lock if possible
instead of a WRITE lock as inherited from the outer DELETE statement.
2009-03-05 15:22:33 +01:00
Sergey Glukhov
72292421d0 Bug#42758 INFORMATION_SCHEMA.COLUMNS is inconsistent
remove 'unsigned', 'zerofill' attributes
from DATA_TYPE column value.
2009-03-05 15:15:47 +04:00
Kristofer Pettersson
57a8d0aa8e Bug#37416 When SQL_NO_CACHE is used, MySQL still lookup into the query cache
The query cache module did not check for the SQL_NO_CACHE keyword before
attempting to query the hash lookup table. This had a small performance impact.

By introducing a check on the query string before obtaining the hash mutex
we can gain some performance if the SQL_NO_CACHE directive is used often.
2009-03-05 11:41:19 +01:00
He Zhenxing
39da93981b Auto merge 2009-03-05 18:34:57 +08:00
He Zhenxing
f2fca881c4 Null merge backporting patch of BUG#37051 from 5.0-bugteam to 5.1-bugteam 2009-03-05 18:23:46 +08:00
He Zhenxing
52a07e9b74 BUG#37051 Replication rules not evaluated correctly
Backporting patch to 5.0.
2009-03-05 18:10:44 +08:00
Narayanan V
1a5751ba4e Bug#42790 Test 'main.innodb' fails from "InnoDB: Error: in ALTER TABLE"
The problem here seem to be that when mysql
is redirecting stderr to a file, stderr becomes 
buffered, whereas it is unbuffered by definition.

The solution is to unbuffer it by setting buffer
to null.
2009-03-05 15:18:03 +05:30
Staale Smedseng
ea54709f6a Addendum to previous patch for Bug#29458. A number
of system errnos when opening a table are masked 
as ER_FILE_NOT_FOUND. This patch handles this as
"Operation failed" as well.
2009-03-05 09:41:00 +01:00
Bjorn Munch
6dbc7df463 merge 42797 2009-03-04 16:41:45 +01:00
Bernt M. Johnsen
715dc22d62 Bug 43258 merged from gca 2009-03-04 15:56:13 +01:00
Bernt M. Johnsen
1bcafb4b74 bug#43258 prepared for push on 5.1 2009-03-04 13:45:49 +01:00
Dmitry Lenev
ac2d9c177d Fix for bug #40702 "skip_name_resolve fails sporadically on
pushbuild".

Under new MTR the server is not restarted for every test, so
threads started in the previous test case can show up in the
results of SHOW PROCESSLIST statement in this test, causing a
test failure.

Since we are not really interested in results of SHOW PROCESSLIST
in this test but rather in fact that server doesn't crash when
executing this statement this fix simply disables output of this
statement.
2009-03-04 15:33:56 +03:00