Commit graph

68762 commits

Author SHA1 Message Date
MySQL Build Team
a12b2a2e45 Per Jon Olav, change needed for Bug#11784056 2011-03-22 16:52:03 +01:00
Sunanda Menon
5dc4f1ef42 merge 2011-03-22 14:34:04 +01:00
Georgi Kodinov
eb3981ddb7 merge 2011-03-18 17:00:13 +02:00
Georgi Kodinov
52edb4a5b9 Bug # 11766011: mysql.user.authentication_string column causes
configuration wizard to fail

Made the fields mysql.user.plugin and mysql.user.authentication_string
nullable to conform with some older clients doing inserts instead of 
using the commands.
2011-03-18 16:16:17 +02:00
Tor Didriksen
8efbb825de local merge 2011-03-18 13:38:18 +01:00
Vinay Fisrekar
652f2b6f4b up-merge 5.1 --> 5.5
+
Bug#11766500 - 59624: FUNCS_1 SUITE TESTS FAILING WITH RESULT DIFFERENCE WHEN RUN USING EMBEDDED MODE
      
Updating result files for embedded mode
2011-03-18 16:44:42 +05:30
Vinay Fisrekar
e8ad8f4fd8 Bug#11766500 - 59624: FUNCS_1 SUITE TESTS FAILING WITH RESULT DIFFERENCE WHEN RUN USING EMBEDDED MODE
Updating result files
2011-03-18 16:35:57 +05:30
Alexander Nozdrin
6c2704cdc7 Merge from mysql-5.1. 2011-03-18 13:58:05 +03:00
Mattias Jonsson
27fbf4ed39 merge 2011-03-18 11:18:23 +01:00
Mattias Jonsson
be59ccd6a9 Bug#11867664: SERVER CRASHES ON UPDATE WITH JOIN ON PARTITIONED TABLE
Regression from bug#11766232.
m_last_part could be set beyond the last partition.
Fixed by only setting it if within the limit.
Also added check in print_error.
2011-03-18 11:03:54 +01:00
Georgi Kodinov
0ded0c6f60 Bug addendum :
Fixed test suite failures when the auth plugin is not compiled in.
2011-03-18 10:31:39 +01:00
Georgi Kodinov
6ebf55aff9 merge 2011-03-17 16:09:06 +02:00
Kent Boortz
4b8fc90d53 Merge 2011-03-17 15:06:25 +01:00
Kent Boortz
6260214cd4 Merge 2011-03-17 15:02:28 +01:00
Georgi Kodinov
cc1b046c3e Bug : 60075: MYSQL_LOAD_CLIENT_PLUGIN DOESN'T CLEAR ERROR
Added the cleanup code.
Extended mysql_client_test to take --plugin-dir and --default_auth.
Added a C test case.
2011-03-17 15:52:49 +02:00
Alfranio Correia
6cafefd2a5 merge mysql-5.5 (local) --> mysql-5.5 2011-03-17 13:25:44 +00:00
Nirbhay Choubey
bb0c50c7b1 BUG#11766184 - 59234 : cmdline clients crash --defaults-extra-file
with no .cnf or .ini extension.

Fix for this bug was pushed as part of Bug#11765482.
2011-03-17 18:01:06 +05:30
Alfranio Correia
84e27741d2 merge mysql-5.5 (local) --> mysql-5.5 2011-03-17 12:12:25 +00:00
Nirbhay Choubey
9c08717aa0 Merge from mysql-5.1 -> mysql-5.5. 2011-03-17 16:31:31 +05:30
Nirbhay Choubey
da70b67a41 Minor fix in mysqldump test. 2011-03-17 16:28:16 +05:30
Sven Sandberg
c0613a9fd7 BUG#11877618: rpl_slave_net_timeout fails in rpl_sync.inc (at sync_slave_with_master)
Problem: the test had not been updated after BUG#49978 was pushed
Fix: add 'set $rpl_only_running_threads= 1' to the end of the test
and update the result file.
Also, use include/assert.inc for an assertion (instead of relying
on result file comparison).
Also, move 'set @@global.slave_net_timeout' forwards, to get rid
of a warning.
2011-03-17 11:31:42 +01:00
Kent Boortz
bd58869ebe Merge 2011-03-16 23:33:12 +01:00
Kent Boortz
0ecdad77b2 Merge 2011-03-16 23:26:19 +01:00
Kent Boortz
16fe0c0ceb Removed the "Third-Party Component Notices" part from README 2011-03-16 23:11:25 +01:00
Kent Boortz
0a23e39b62 Removed the "Third-Party Component Notices" part from README 2011-03-16 23:07:05 +01:00
Kent Boortz
35bda0ae15 Removed the "Third-Party Component Notices" part 2011-03-16 23:04:29 +01:00
Alfranio Correia
6d07a87a58 BUG#11877568 - RPL_SEMI_SYNC FAILS IN PB
Currently, rpl_semi_sync is failing in PB due to the warning message:

  "Slave SQL: slave SQL thread is being stopped in the middle of "
  "applying of a group having updated a non-transaction table; "
  "waiting for the group completion ..."

The problem started happening after the fix for BUG#11762407 what was
automatically suppressing some warning messages.

To fix the current issue, we suppress the aforementioned warning message
and exploit the opportunity to make the sentence clearer.
2011-03-16 16:38:30 +00:00
Luis Soares
37f49e697e Fix for BUG#11868903 (BUG#59717).
Automerge: mysql-5.1 --> mysql-5.5
2011-03-16 15:16:41 +00:00
Luis Soares
f39b86d772 Fix for BUG#11868903 (BUG#59717)
There is a race between two threads: user thread and the dump
thread. The former sets a debug instruction that makes the latter wait
before processing an Xid event. There can be cases that the dump
thread has not yet processed the previous Xid event, causing it to
wait one Xid event too soon, thus causing sync_slave_with_master never
to resume.
      
We fix this by moving the instructions that set the debug variable
after calling sync_slave_with_master.
2011-03-16 15:11:54 +00:00
hery.ramilison@oracle.com
18d2e55c51 Merge from mysql-5.5.10-release 2011-03-16 15:11:20 +01:00
Serge Kozlov
5aed245098 bug#58525 postfix 2011-03-16 00:46:30 +03:00
Sven Sandberg
634c654c27 BUG#11872422: rpl_slave_load_remove_tmpfile fails sporadically in pb2
Problem: the test failed because errors were found in the error log.
The test case contains suppressions for an old version of the error message,
but the format of the error message has changed without updating the suppression.
Fix: Update the suppression. Also small fixes to improve the test.
2011-03-15 16:12:41 +01:00
Dmitry Shulga
10f5982ee5 Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial
of service in prepared statements).
2011-03-15 18:57:36 +06:00
Dmitry Shulga
6c2f5e306c Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".
The problem was that server didn't check resulting size of prepared
statement argument which was set using mysql_send_long_data() API.
By calling mysql_send_long_data() several times it was possible
to create overly big string and thus force server to allocate
memory for it. There was no way to limit this allocation.

The solution is to add check for size of result string against
value of max_long_data_size start-up parameter. When intermediate
string exceeds max_long_data_size value an appropriate error message
is emitted.

We can't use existing max_allowed_packet parameter for this purpose
since its value is limited by 1GB and therefore using it as a limit
for data set through mysql_send_long_data() API would have been an
incompatible change. Newly introduced max_long_data_size parameter
gets value from max_allowed_packet parameter unless its value is
specified explicitly. This new parameter is marked as deprecated
and will be eventually replaced by max_allowed_packet parameter.
Value of max_long_data_size parameter can be set only at server
startup.
2011-03-15 17:36:12 +06:00
Jon Olav Hauglid
14df359b39 Bug (former 58381)
FAILED DROP DATABASE CAN BREAK STATEMENT BASED REPLICATION

The first phase of DROP DATABASE is to delete the tables in the database.
If deletion of one or more of the tables fail (e.g. due to a FOREIGN KEY
constraint), DROP DATABASE will be aborted. However, some tables could
still have been deleted. The problem was that nothing would be written
to the binary log in this case, so any slaves would not delete these tables.
Therefore the master and the slaves would get out of sync.

This patch fixes the problem by making sure that DROP TABLE is written
to the binary log for the tables that were in fact deleted by the failed
DROP DATABASE statement.

Test case added to binlog.binlog_database.test.
2011-03-15 11:49:14 +01:00
Bjorn Munch
e9394e9955 Add warning suppression to test rpl.rpl_slave_load_remove_tmpfile 2011-03-15 10:58:54 +01:00
Chuck Bell
d6d4c08975 Local merger for BUG#59752 2011-03-14 14:42:00 -04:00
Davi Arnaut
0bca20e626 Merge of mysql-5.1 into mysql-5.5. 2011-03-14 15:06:44 -03:00
Davi Arnaut
8da2b4f5d7 Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion `!_entered' failed.
Add a missing DBUG_RETURN function test_if_number().
2011-03-14 15:03:22 -03:00
Magne Mahre
658340319b Bug#11858960 - WINDOWS SERVICE FAILING TO START IMMEDIATELY AFTER
INSTALLATION

When starting mysqld as an MS Windows NT service, it crashed 
with "Error 1067: The process terminated unexpectedly".

The problem is that thread local variables are not allocated
and initialized properly when started as a service. When the
server is started as a regular executable, the problem does
not occur.

Analysis showed that this is a regression after the patch for 
Bug#11765237/Bug#11763065.   Before, the thread local storage
was initialized by the call chain:
win_main->my_basic_init->my_thread_basic_global_init->
my_thread_init

When the my_init() structure was changed, this initialization
was moved from win_main to mysqld_main.   When started as
a service win_main is run in a separate thread, which does
not have mysqld_main in its call path, so my_thread_init
is never called for this thread.

Added a call to my_thread_init / my_thread_end in the service
handler function, which solves the problem.
2011-03-14 14:03:48 +01:00
Alexander Nozdrin
42e3c5d13c A patch for Bug#11765297 (58251 - archive_plugin and blackhole_plugin
fails when running with ps-protocol).

The problem was that when running in --ps-protocol mode mysqltest.cc
didn't close created prepared statements. So, the plugins could not be
unistalled because there was a prepared statement using them.

A fix is to add a dummy statement that forces mysqltest.cc to close
the last prepared statement (which uses a plugin-defined table).
2011-03-14 14:03:08 +03:00
Chuck Bell
ba8b8ccb78 BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64)
This patch corrects the problem by fixing the definition and alterations
of the mysql.user table in the .sql files.

Also included are new result files for tests that examine the name 
column of the mysql.user table.
2011-03-11 10:15:57 -05:00
Joerg Bruehe
a8f5ef6259 Fight a problem in internal test builds:
When a RPM test build in a non-release branch is done,
the $MYSQL_BINDIR variable ends in "/usr"
(rather than in "/usr/lib" as in a RPM release build),
this made test "file_contents" fail.

A branch for this case is added to the test.
The test result is unchanged.
2011-03-11 16:00:53 +01:00
Bjorn Munch
8db063f333 null upmerge 2011-03-11 12:52:59 +01:00
Bjorn Munch
0b7b6793d1 merge from 5.5-mtr 2011-03-11 12:51:51 +01:00
Bjorn Munch
11e879feb6 merge from 5.1-mtr 2011-03-11 12:49:14 +01:00
Mayank Prasad
c3e5bd9edc merge from mysql5.1 for bug#11760210 2011-03-11 17:01:19 +05:30
Mayank Prasad
74a438fc5b BUG : 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
Issue:
      SSL_CIPHER set to a specific CIPHER name was not getting picked up by SHOW STATUS Command.

Solution:
      If specific cipher name is specified, avoid overwriting of Cipher List with default Cipher names.
2011-03-11 16:16:34 +05:30
Marc Alff
a7211fb810 Test cleanup 2011-03-11 11:45:16 +01:00
Bjorn Munch
43e426c76b null upmerge 2011-03-11 10:33:37 +01:00