Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Fixes:
Bug#9709: InnoDB inconsistensy causes "Operating System Error 32/33"
Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load
Bug#25645: Assertion failure in file srv0srv.c
Bug#27294: insert into ... select ... causes crash with innodb_locks_unsafe_for_binlog=1
Bug#28138: indexing column prefixes produces corruption in InnoDB
innobase/btr/btr0btr.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1547:
branches/5.0: Merge r1546 from trunk:
When buffering an insert to a prefix index of a variable-length column,
do not incorrectly mark the column as fixed-length. (Bug #28138)
ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
dtype_new_store_for_order_and_null_size(). Add debug assertions.
btr_index_rec_validate(): Correct a comment about prefix indexes.
rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
debug assertions and comments.
dict_col_type_assert_equal(): New debug function.
innobase/buf/buf0buf.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1502:
branches/5.0: Add debug code for Bug 26081. This change has some debug
assertions that have been promoted to normal assertions. These will need
to be undone once we've nailed this bug.
innobase/buf/buf0lru.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1502:
branches/5.0: Add debug code for Bug 26081. This change has some debug
assertions that have been promoted to normal assertions. These will need
to be undone once we've nailed this bug.
innobase/ibuf/ibuf0ibuf.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1547:
branches/5.0: Merge r1546 from trunk:
When buffering an insert to a prefix index of a variable-length column,
do not incorrectly mark the column as fixed-length. (Bug #28138)
ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
dtype_new_store_for_order_and_null_size(). Add debug assertions.
btr_index_rec_validate(): Correct a comment about prefix indexes.
rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
debug assertions and comments.
dict_col_type_assert_equal(): New debug function.
innobase/include/buf0buf.ic:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1502:
branches/5.0: Add debug code for Bug 26081. This change has some debug
assertions that have been promoted to normal assertions. These will need
to be undone once we've nailed this bug.
innobase/include/buf0lru.h:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1502:
branches/5.0: Add debug code for Bug 26081. This change has some debug
assertions that have been promoted to normal assertions. These will need
to be undone once we've nailed this bug.
innobase/include/dict0dict.h:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1547:
branches/5.0: Merge r1546 from trunk:
When buffering an insert to a prefix index of a variable-length column,
do not incorrectly mark the column as fixed-length. (Bug #28138)
ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
dtype_new_store_for_order_and_null_size(). Add debug assertions.
btr_index_rec_validate(): Correct a comment about prefix indexes.
rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
debug assertions and comments.
dict_col_type_assert_equal(): New debug function.
innobase/include/dict0dict.ic:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1547:
branches/5.0: Merge r1546 from trunk:
When buffering an insert to a prefix index of a variable-length column,
do not incorrectly mark the column as fixed-length. (Bug #28138)
ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
dtype_new_store_for_order_and_null_size(). Add debug assertions.
btr_index_rec_validate(): Correct a comment about prefix indexes.
rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
debug assertions and comments.
dict_col_type_assert_equal(): New debug function.
innobase/include/dict0mem.h:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1537:
branches/5.0: merge r1536 and partially r1535
Change the comment to a more appropriate one. Discussed with Heikki on IM.
Document that DICT_MAX_INDEX_COL_LEN should not be changed.
innobase/include/os0file.h:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1417:
branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
ERROR_LOCK_VIOLATION is encountered during file operation.
This is caused by backup software, so InnoDB should retry while the backup
software is done with the file.
Approved by: Heikki
innobase/include/trx0trx.h:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1463:
branches/5.0: merge r1462 from trunk:
Fix typo in comment.
innobase/lock/lock0lock.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1458:
branches/5.0: Fix Bug#22819, remove assertion. (http://bugs.mysql.com/bug.php?id=22819)
innobase/log/log0log.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1520:
Patch to allow monitor threads to stop before proceeding with normal shutdown.
Also have a separate time counter for tablespace monitor.
reviewed by: Heikki
Revision r1525:
backport of r1524
Log:
Undo bad space formatting introduced in earlier commit r1521
spotted by: Marko
innobase/mtr/mtr0mtr.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1502:
branches/5.0: Add debug code for Bug 26081. This change has some debug
assertions that have been promoted to normal assertions. These will need
to be undone once we've nailed this bug.
innobase/os/os0file.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1417:
branches/5.0: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or
ERROR_LOCK_VIOLATION is encountered during file operation.
This is caused by backup software, so InnoDB should retry while the backup
software is done with the file.
Approved by: Heikki
innobase/rem/rem0rec.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1547:
branches/5.0: Merge r1546 from trunk:
When buffering an insert to a prefix index of a variable-length column,
do not incorrectly mark the column as fixed-length. (Bug #28138)
ibuf_entry_build(): Instead of prefix_len, pass fixed_len to
dtype_new_store_for_order_and_null_size(). Add debug assertions.
btr_index_rec_validate(): Correct a comment about prefix indexes.
rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add
debug assertions and comments.
dict_col_type_assert_equal(): New debug function.
innobase/row/row0sel.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1456:
branches/5.0: merge r1452 from trunk:
Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's
patch in the bug followup.
innobase/srv/srv0srv.c:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1460:
branches/5.0: Merge r1459 from trunk:
Fix typo in the comment.
Revision r1520:
Patch to allow monitor threads to stop before proceeding with normal shutdown.
Also have a separate time counter for tablespace monitor.
reviewed by: Heikki
sql/ha_innodb.cc:
Apply innodb-5.0-* snapshots: ss1489 and ss1547.
Revision r1436:
branches/5.0: Fix Bug#27294 by using trx returned by check_trx_exists()
instead of prebuilt->trx. This has been fixed in 5.1 in r782.
Approved by: Heikki
Revision r1443:
branches/5.0: merge r1442 from trunk:
Potential fix for Bug#25645:
"Move innobase_release_stat_resources(trx) outside the 'if' in
ha_innobase::external_lock(). That would add more safety that whatever
MySQL does at a query end, there would be no risk of a hang on the btr
search latch."
Also call innobase_release_temporary_latches() in the beginning of
ha_innobase::close().
Approved by: Heikki
Revision r1454:
branches/5.0: merge r1453 from trunk:
Bugfix: only call innobase_release_temporary_latches() in case of current_thd
is not NULL, otherwise we get NULL pointer dereferencing.
Revision r1504:
branches/5.0: Apply patch for Bug 27650 from MySQL.
Revision r1539:
Backport of r1538 from 5.1
Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for
normal processing of the query by MySQL instead of generating an error.
Reviewed by: Heikki
The Ctrl-C handler in mysql closes the console while ReadConsole()
waits for console input.
But the main thread was detecting that ReadConsole() haven't read
anything and was processing as if there're data in the buffer.
Fixed to handle correctly this error condition.
No test case added as the test relies on Ctrl-C sent to the client
from its console.
client/mysql.cc:
Bug #29469: handle correctly console read error
mysys/my_conio.c:
Bug #29469:
1. handle correctly console read error
2. add boundry checks for console buffer.
Backport from 5.1 a fix to make this test deterministic
mysql-test/r/rpl_misc_functions.result:
Backport from 5.1 a fix to make this test deterministic
mysql-test/t/rpl_misc_functions.test:
Backport from 5.1 a fix to make this test deterministic
1. Threat MBR for a key as double[] and convert it only
when about to store it on disk.
2. Remove the redundant function get_double().
myisam/sp_key.c:
Bug #29070:
1. threat MBR for a key as double[] and convert it only
when about to store it on disk.
2. remove the redundant function get_double()
mysql-test/r/gis-rtree.result:
Bug #29070: test case
mysql-test/t/gis-rtree.test:
Bug #29070: test case
dollin' it up for Guilhem ;) -- test streamlined,
better comments, faster code, add'l assert.
mysql-test/r/binlog.result:
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
streamlined test
mysql-test/t/binlog.test:
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
streamlined test
sql/log.cc:
Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
comment clarified
with the space character.
When the my_strnncollsp_simple function compares two strings and one is a prefix
of another then this function compares characters in the rest of longer key
with the space character to find whether the longer key is greater or less.
But the sort order of the collation isn't used in this comparison. This may
lead to a wrong comparison result, wrongly created index or wrong order of the
result set of a query with the ORDER BY clause.
Now the my_strnncollsp_simple function uses collation sort order to compare
the characters in the rest of longer key with the space character.
mysql-test/t/ctype_collate.test:
Added a test case for the bug#29461: Sort order of the collation wasn't used when
comparing characters with the space character.
mysql-test/r/ctype_collate.result:
Added a test case for the bug#29461: Sort order of the collation wasn't used when
comparing characters with the space character.
strings/ctype-simple.c:
Bug#29461: Sort order of the collation wasn't used when comparing characters
with the space character.Now the my_strnncollsp_simple function uses collation sort order to compare
the characters in the rest of longer key with the space character.
An assertion abort could occur for some grouping queries that employed
decimal user variables with assignments to them.
The problem appeared the constructors of the class Field_new_decimal
because the function my_decimal_length_to_precision did not guarantee
returning decimal precision not greater than DECIMAL_MAX_PRECISION.
mysql-test/r/type_newdecimal.result:
Added a test case for bug #29417.
mysql-test/t/type_newdecimal.test:
Added a test case for bug #29417.
sql/field.cc:
Fixed bug #29417.
An assertion abort could occur for some grouping queries that employed
decimal user variables with assignments to them.
The problem appeared the constructors of the class Field_new_decimal
because the function my_decimal_length_to_precision did not guarantee
returning decimal precision not greater than DECIMAL_MAX_PRECISION.
Now if the precision returned by calls to my_decimal_length_to_precision
in the constructors of the class Field_new_decimal is greater than
DECIMAL_MAX_PRECISION the precision is set to this value.
The cast operation ignored the cases when the precision and/or the scale exceeded
the limits, 65 and 30 respectively. No errors were reported in these cases.
For some queries this may lead to an assertion abort.
Fixed by throwing errors for such cases.
mysql-test/r/type_newdecimal.result:
Added a test case for bug #29415.
mysql-test/t/type_newdecimal.test:
Added a test case for bug #29415.
For GCov builds, if the server crashes, the normal exit handler for writing
coverage information is not executed due to the abnormal termination.
Fix this by explicitly calling the __gcov_flush function in our crash handler.
The need arose when working on Bug 26141, where it became
necessary to replace TABLE_LIST with its forward declaration in a few
headers, and this involved a lot of s/TABLE_LIST/st_table_list/.
Although other workarounds exist, this patch is in line
with our general strategy of moving away from typedef-ed names.
Sometime in future we might also rename TABLE_LIST to follow the
coding style, but this is a huge change.
sql/item.cc:
st_table_list -> TABLE_LIST
sql/item.h:
st_table_list -> TABLE_LIST
sql/mysql_priv.h:
st_table_list -> TABLE_LIST
sql/sql_base.cc:
st_table_list -> TABLE_LIST
sql/sql_lex.cc:
st_table_list -> TABLE_LIST
sql/sql_lex.h:
st_table_list -> TABLE_LIST
sql/sql_select.cc:
st_table_list -> TABLE_LIST
sql/sql_show.cc:
st_table_list -> TABLE_LIST
sql/sql_udf.h:
Was not needed.
sql/table.cc:
st_table_list -> TABLE_LIST
sql/table.h:
st_table_list -> TABLE_LIST
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
libmysql/libmysql.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Manual merge from main 5.1 to 5.1-marvel.
mysql-test/t/innodb_mysql.test:
Manual merge from main 5.1 to 5.1-marvel.
The SELECT INTO OUTFILE FIELDS ENCLOSED BY digit or minus sign,
followed by the same LOAD DATA INFILE statement, used wrond encoding
of non-string fields contained the enclosed character in their text
representation.
Example:
SELECT 15, 9 INTO OUTFILE 'text' FIELDS ENCLOSED BY '5';
Old encoded result in the text file:
5155 595
^ was decoded as the 1st enclosing character of the 2nd field;
^ was skipped as garbage;
^ ^ was decoded as a pair of englosing characters of the 1st field;
^ was decoded as traling space of the first field;
^^ was decoded as a doubled enclosed character.
New encoded result in the text file:
51\55 595
^ ^ pair of enclosing characters of the 1st field;
^^ escaped enclosed character.
sql/sql_class.h:
Fixed bug #29442.
The NUMERIC_CHARS macro constant has been defined to enumerate
all possible characters of a numeric value text representation.
The select_export::is_unsafe_field_sep boolean flag has been added
to apply the encoding algorithm to non-string values when it is
necessary.
sql/sql_class.cc:
Fixed bug #29442.
The select_export::send_data method has been modified to encode text
representation of fields of all data types like string fields.
mysql-test/t/loaddata.test:
Updated test case for bug #29442.
mysql-test/r/loaddata.result:
Updated test case for bug #29442.
