Commit graph

55346 commits

Author SHA1 Message Date
Sergey Glukhov
dacd8066c0 automerge 2008-12-09 16:17:17 +04:00
Sergey Glukhov
82aedffa03 5.0-bugteam->5.1-bugteam merge
mysql-test/r/myisam_data_pointer_size_func.result:
  restore default value
mysql-test/r/partition_datatype.result:
  test case fix
mysql-test/t/myisam_data_pointer_size_func.test:
  restore default value
2008-12-09 15:16:39 +04:00
Alexey Kopytov
b722a89913 Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. 2008-12-09 13:56:46 +03:00
Alexey Kopytov
121ed547e9 Merge from mysql-5.0-bugteam. 2008-12-09 13:22:55 +03:00
Alexey Kopytov
06c4ff1c13 Added a missing bit from the original patch for bug which was lost when re-applying
the patch manually to another tree.
2008-12-09 13:19:46 +03:00
Sergey Glukhov
681a2d1a53 bug#35558 Wrong server metadata blows up the client
the problem: FORMAT func max_length value was calculated incorrectly
the fix: correct calculation of max_length


mysql-test/r/func_str.result:
  test result
mysql-test/t/func_str.test:
  test case
sql/item_strfunc.h:
  the problem: FORMAT func max_length value was calculated incorrectly
  the fix: correct calculation of max_length
2008-12-09 14:00:43 +04:00
Sergey Glukhov
cbb368aa88 Bug#35796 SHOW CREATE TABLE and default value for BIT field
show default value for BIT field in printable format


mysql-test/r/type_bit.result:
  Bug#35796 SHOW CREATE TABLE and default value for BIT field
  test result
mysql-test/t/type_bit.test:
  Bug#35796 SHOW CREATE TABLE and default value for BIT field
  test case
sql/item.cc:
  Bug#35796 SHOW CREATE TABLE and default value for BIT field
  issue an error if BIN|HEX deafult value is empty value
  (behaviour like for INT fields)
2008-12-09 13:53:23 +04:00
Sergey Vojtovich
86c976f803 Merge. 2008-12-09 13:29:59 +04:00
Sergey Vojtovich
0e62ee8e79 Merge. 2008-12-09 13:27:46 +04:00
Sergey Glukhov
0d2db9c020 Bug#40949 Debug version of MySQL server crashes when run OPTIMIZE on compressed table.
reset diagnostics area state after error message is sent


mysql-test/r/myisampack.result:
  test result
mysql-test/t/myisampack.test:
  test case
sql/sql_table.cc:
  reset diagnostics area state after error message is sent
2008-12-09 13:04:28 +04:00
Sergey Vojtovich
34eff0a979 Merge. 2008-12-09 12:53:19 +04:00
Alexey Botchkov
3a5fe88d02 merging 2008-12-09 12:47:48 +04:00
Alexey Botchkov
9b6a09d155 Bug#35934 mysql_upgrade calls mysqlcheck with insufficient parameters
modifying the original fix.
    As it turned out --fix-db-names option of the mysqlcheck suppress
    the --check_upgrade option, so we have to call the mysqlcheck twice
    from the mysql_upgrade.

per-file comments:
  client/mysql_upgrade.c
Bug#35934      mysql_upgrade calls mysqlcheck with insufficient parameters
2008-12-09 12:30:49 +04:00
Alexey Kopytov
459c6d184f Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. 2008-12-09 11:11:52 +03:00
Alexey Kopytov
695a2fd90e Fixed type_float failures in --ps-protocol mode introduced by the test case for bug .
The reason for the failures was bug  (fixed in 6.0 by dtoa, but still present in 5.0/5.1).

mysql-test/r/type_float.result:
  Modified the failing test case so that bug  does not occur.
mysql-test/t/type_float.test:
  Modified the failing test case so that bug  does not occur.
2008-12-09 11:05:36 +03:00
Andrei Elkin
ada744b6da merge 5.1-bt to a local clone. 2008-12-09 02:21:06 +02:00
Andrei Elkin
ed7b41d60e Bug Test 'rpl_packet' fails randomly with changed "Exec_Master_Log_Pos"
binlog_row_mix_innodb_myisam resutls are corrected.
The last operations prior the dup error is
TRUNCATE table t2;
Therefore after
--error ER_DUP_ENTRY
INSERT INTO t2 select * from t1;
table t2 must be empty, and that is what the updated results confirm.


mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  results changed due to Bug  fixing.
2008-12-08 21:40:25 +02:00
Andrei Elkin
6dec2c1f6a merging 5.1-bt to a local tree. 2008-12-08 21:26:32 +02:00
Chad MILLER
482fa1f174 Replace C++ comment in a header file. Thanks, Alik! 2008-12-08 12:45:48 -05:00
Vladislav Vaintroub
ff55541a5b merge 2008-12-08 16:37:32 +01:00
Mattias Jonsson
55722c2230 merge 2008-12-08 16:07:41 +01:00
Andrei Elkin
255418d978 Bug Replication failure on RBR + UPDATE the primary key
Extending bug#40221 regression test: 1. include INSERT 2. convert prim key + autoinc to
unique.

mysql-test/suite/binlog/r/binlog_innodb_row.result:
  results changed.
mysql-test/suite/binlog/t/binlog_innodb_row.test:
  Extending bug#40221 regression test to include the INSERT  dup key errored-out case.
2008-12-08 17:07:08 +02:00
Andrei Elkin
3383003787 merge bug#33420, bug#41173 on bt 5.0 -> 5.1 2008-12-08 16:42:59 +02:00
Andrei Elkin
f3d347cfba merge 5.0->5.0-bugteam for a local tree containing bug#33420 Test 'rpl_packet' fails randomly. 2008-12-08 16:29:13 +02:00
Mattias Jonsson
5a3396a213 merge 2008-12-08 15:09:59 +01:00
Mats Kindahl
bf97e59352 Merging with 5.1-bugteam. 2008-12-08 14:40:57 +01:00
Alexey Kopytov
72ba535c37 Pull from mysql-5.0-bugteam 2008-12-08 15:14:10 +03:00
Alexey Botchkov
2d8f9ec5c6 merging 2008-12-08 15:46:19 +04:00
Alexey Kopytov
ebff4ea3a9 Pull from mysql-5.1-bugteam. 2008-12-08 15:19:08 +03:00
Alexey Botchkov
4670abb0a2 merging 2008-12-08 15:41:45 +04:00
Mats Kindahl
b831d619bb Merging patch with 5.1-bugteam. 2008-12-08 11:32:24 +01:00
Georgi Kodinov
a10c3ff2b0 merged bug 37742 to 5.1-bugteam 2008-12-08 12:23:33 +02:00
Georgi Kodinov
8ee2705677 merge 5.0-bugteam -> 5.1-bugteam 2008-12-08 11:57:44 +02:00
Georgi Kodinov
6180bc6356 merged 5.1-main 2008-12-08 11:56:40 +02:00
Georgi Kodinov
d972b96c2d merged 5.0-main -> 5.0-bugteam 2008-12-08 11:54:41 +02:00
Georgi Kodinov
ba816c14a9 merged 5.0-main -> 5.1-main 2008-12-08 11:39:34 +02:00
Alexey Kopytov
6aa4125be3 Merge from mysql-5.0-bugteam to mysql-5.1-bugteam. 2008-12-07 17:51:22 +03:00
Vladislav Vaintroub
20cec8bf8a Bug#39750 -cannot create temp file on Windows.
The problem appears often in conjuction with temp files, when temp-pool is used, so that names of temp files are not unique.

The reason is that rapid deletiion and creation of fiiles with the same name on Windows is not guaranteed to succeed. File disappears from the file system only when the last handle to it is closed. If for example  a virus scanner, a backup or indexing  application  opens the  temp file just before MySQL deletes it, the file will enter "delete pending" state. In this state,it is not possible to open the file , or create a file with the same name (CreateFile returns  ERROR_ACCESS_DENED, posix open returns EACESS)

Fix (rather a cheap workarounf) is not to use temp-pool when working with temporary files- this will make filenames unique. 
With this patch , temp- pool setting will be ignored on anything but Linux(the option only made sense for Linux since its invention anyway).
2008-12-05 19:20:05 +01:00
Georgi Kodinov
1bb6a0ba9f Disable wait_timeout_func and report bug . 2008-12-05 13:24:19 +02:00
Mats Kindahl
832770842e Bug :
Uncommited changes are replicated and stay on slave after
rollback on master

Making test slightly more generic and robust.

mysql-test/suite/rpl/t/rpl_trigger.test:
  Adding code to check that InnoDB is available on slave as well.
  Making code slightly more generic.
2008-12-05 10:23:27 +01:00
Vladislav Vaintroub
8f500c522b Bug#38522: 5 seconds delay when closing application using embedded server
The problem here is that embedded server starts handle_thread manager 
thread  on mysql_library_init() does not stop it on mysql_library_end().
At shutdown, my_thread_global_end() waits for thread count to become 0,
but since we did not stop the thread it will give up after 5 seconds.
             
Solution is to move shutdown for handle_manager thread from kill_server()
(mysqld specific) to clean_up() that is used by both embedded and mysqld.
            
This patch also contains some refactorings - to avoid duplicate code,
start_handle_manager() and stop_handle_manager() functions are introduced.
Unused variables are eliminated. handle_manager does not rely on global
variable abort_loop anymore to stop (abort_loop is not set for embedded).
            
Note: Specifically on Windows and when using DBUG version of libmysqld, 
the complete solution requires removing obsolete code my_thread_init() 
from my_thread_var(). This has a side effect that a DBUG statement 
after my_thread_end() can cause thread counter to be incremented, and 
embedded will hang for some seconds. Or worse, my_thread_init() will 
crash if critical sections have been deleted by the global cleanup 
routine that runs in a different thread. 

This patch also fixes and revert prior changes for Bug#38293 
"Libmysqld crash in mysql_library_init if language file missing".

Root cause of the crash observed in Bug#38293  was bug in my_thread_init() 
described above




client/mysql.cc:
  sql_protocol_typelib is not exported from libmysqld
  (does not make sense either)
  thus excluded from embedded client
dbug/dbug.c:
  revert changes for Bug#38293
include/my_dbug.h:
  revert changes for Bug#38293
libmysql/libmysql.c:
  Removed DBUG_POP call, because when called after my_end(), will access
  THR_key_mysys that is already deleted. The result of pthread_get_specific
  is not predictable in this case and hence DBUG_POP can crash.
libmysqld/examples/CMakeLists.txt:
  Revert changes for Bug#38293.
libmysqld/lib_sql.cc:
  code to start handle manager is factored out into 
  start_handle_manager() function
libmysqld/libmysqld.def:
  Revert changes for Bug 
  Remove excessive exports from libmysqld, export what API documents.
mysys/my_thr_init.c:
  Remove windows-DLL-specific workaround for something (old code, no documentation for
  what specifically). The problem is that even after my_thread_end() is finished, 
  DBUG statement can initiate my_thread_init(). This does not happen anywhere else and 
  should not happen on  Windows either.
sql/mysql_priv.h:
  - new functions start_handle_manager() and stop_handle_manager()
  - move manager_thread_in_use  variable to sql_manager.cc and made
  it static
  - remove manager_status, as it is unused
sql/mysqld.cc:
  Code to start/stop handle_manager thread is factored out into start_handle_manager()
2008-12-04 19:41:53 +01:00
Andrei Elkin
6d717c21e7 Bug Test 'rpl_packet' fails randomly with changed "Exec_Master_Log_Pos"
Bug  rpl_packet fails sporadically on pushbuild: query 'DROP TABLE t1' failed


The both issues appeared to be a race between the SQL thread executing CREATE table t1
and the IO thread that is expected to stop at the consequent big size event.
The two events need serialization which is implemented.
The early bug required back-porting a part fixes for bug#38350 exclusively for 5.0 version.



mysql-test/r/rpl_packet.result:
  results changed due to bug#33420, bug#41173.
mysql-test/t/rpl_packet.test:
  adding synchronization for sql and io thread (bug#41173 problem).
  simplifying the output to show only a relevant info (5.0 sole problem bug#33420).
2008-12-04 18:36:45 +02:00
Mats Kindahl
43e9d5b3d5 Bug : Uncommited changes are replicated and stay on slave
after rollback on master

When starting a transaction with a statement containing changes
to both transactional tables and non-transactional tables, the
statement is considered as non-transactional and is therefore
written directly to the binary log. This behaviour was present
in 5.0, and has propagated to 5.1.

If a trigger containing a change of a non-transactional table is
added to a transactional table, any changes to the transactional
table is "tainted" as non-transactional.

This patch solves the problem by removing the existing "hack" that
allows non-transactional statements appearing first in a transaction
to be written directly to the binary log. Instead, anything inside
a transaction is treaded as part of the transaction and not written
to the binary log until the transaction is committed.

mysql-test/suite/rpl/t/rpl_row_create_table.test:
  Removing positions from SHOW BINLOG EVENTS and using
  reset_master_and_slave to start on a fresh binary log each time.
mysql-test/suite/rpl/t/rpl_slave_skip.test:
  Adding explicit commit in AUTOCOMMIT=0 to make test work correctly.
mysql-test/suite/rpl/t/rpl_trigger.test:
  Adding test case for BUG#40116.
sql/log.cc:
  Changing commit logic in binlog_commit() to only commit when
  committing a real transaction or committing a punch transaction.
2008-12-03 20:55:49 +01:00
Alexey Kopytov
91f0c94c23 Fix for bug : Casting 'scientific notation type' to 'unsigned
bigint' fails on windows.

Visual Studio does not take into account some x86 hardware limitations
which leads to incorrect results when converting large DOUBLE values
to BIGINT UNSIGNED ones.

Fixed by adding a workaround for double->ulonglong conversion on
Windows.


include/config-win.h:
  Added double2ulonglong(double) function implementing a workaround for
  broken double->ulonglong conversion on Windows/x86.
include/my_global.h:
  Define double2ulonglong() as a simple typecast for anything but
  Windows.
mysql-test/r/type_float.result:
  Added a test case for bug .
mysql-test/t/type_float.test:
  Added a test case for bug .
2008-12-03 19:15:39 +03:00
unknown
7391280c15 Raise version number after cloning 5.0.74 2008-12-03 01:09:05 +01:00
Andrei Elkin
8ebce5350e Bug Replication failure on RBR + UPDATE the primary key
A transaction could result in having an extra event after a query that
errored e.g because of a dup key. Such a query is rolled back in
innodb, as specified, but has not been in binlog.
It appeares that the binlog engine did not always register for a query
(statement) because the previous query had not reset at its statement
commit time. Because of that fact there was no roll-back to the
trx_data->before_stmt_pos position and a the pending event of the
errorred query could become flushed to the binlog file.

Fixed with deploying the reset of trx_data->before_stmt_pos at the end
of the query processing.


mysql-test/suite/binlog/r/binlog_innodb_row.result:
  a new test file to contain tests dealing with binlogging innodb with
  the row-based format.
mysql-test/suite/binlog/t/binlog_innodb_row.test:
  a new test file to contain tests dealing with binlogging innodb with
  the row-based format.
sql/log.cc:
  Flushing the pending row event at binlog_end_trans() is moved down to the commit
  branch.
  Resetting of trx_data->before_stmt_pos to the uninitialized value at the end of the
  statement is implemented in binlog_commit() and binlog_rollback().
  Asserting emptiness the transaction cache after reset() and the uninitilized value for the statement's savepoint binlog position.
2008-12-02 19:32:07 +02:00
Georgi Kodinov
71dbb4987f moved the version to 5.0-main 2008-12-02 14:50:40 +02:00
Georgi Kodinov
014143e858 Fixed a bad merge (5.0->5.1) of the fix for bug 37339.
There was a missing initialization.

sql/set_var.h:
  Added an initialization missing during the merge of 37339.
2008-12-02 13:21:05 +02:00
Georgi Kodinov
bd53e304d7 Addendum to the fix for bug : Server crash in YaSSL
with non-RSA-requesting client if server uses RSA key

matchSuite() may not find a match. 
It will return error in this case.
Added a error checking code that will prevent using uninitialized 
memory in the code based on the assumption 
that matchSuite() has found a match.

extra/yassl/src/yassl_imp.cpp:
  Bug : Correct error checking added
2008-12-02 13:15:28 +02:00
Georgi Kodinov
47cff6998a merged addendum to bug 39920 to 5.1-bugteam 2008-12-01 17:43:51 +02:00