summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug#31384 DATE_ADD() and DATE_SUB() return binary dataAlexander Barkov2011-02-1010-14/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: DATE_ADD() is a hybrid function and can return DATE, DATETIME or VARCHAR data type depending on arguments. In case of VARCHAR data type, DATE_ADD() reported "binary" character set, which was wrong. Fix: make DATE_ADD() return @character_set_connection in VARCHAR context. @ mysql-test/include/ctype_numconv.inc Adding tests @ mysql-test/r/ctype_binary.result Adding tests @ mysql-test/r/ctype_cp1251.result Adding tests @ mysql-test/r/ctype_latin1.result Adding tests @ mysql-test/r/ctype_ucs.result Adding tests @ mysql-test/r/ctype_utf8.result Adding tests @ sql/item_strfunc.cc - Moving code from Item_str_ascii_func::val_str() to Item_str_func::val_str_from_val_str_ascii(), as this code needs to be shared by Item_date_add_interval. - Adding str2 parameter to be used as a buffer, instead of using private ascii_buf member. @ sql/item_strfunc.h - Moving code from Item_str_ascii_func::val_str() to Item_str_func::val_str_from_val_str_ascii() - Removing "String *val_str_convert_from_ascii(String *str, String *ascii_buf)" prototype as it was neither used nor declared. @ sql/item_timefunc.h - Overwriting parent's charset_for_protocol() method, becase we need to behave differenlty in VARCHAR and DATE/DATETYPE context. - Adding ascii_buf for conversion. - Adding val_str_ascii() prototype. - Adding val_str() which uses newly added Item_str_func::val_str_from_val_str_ascii(), passing ascii_buf as a conversion buffer.
* Merging with mysql-5.5Mats Kindahl2011-02-098-25/+72
|\
| * Combine test-bt and test-bt-debug into a single default.releaseJonathan Perkin2011-02-095-13/+11
| | | | | | | | | | | | | | | | collection, utilising the new --debug-server option for the debug run to ensure the correct binaries are used. Remove test-bt-*fast, they are unused.
| * Silly mistake in 59148, forgot .exe on WindowsBjorn Munch2011-02-091-1/+1
| |
| * Empty upmerge.Joerg Bruehe2011-02-090-0/+0
| |\
| | * Merge bugfix 56581 into main.Joerg Bruehe2011-02-091-10/+48
| | |\
| * | \ Merge bugfix 56581 into main.Joerg Bruehe2011-02-091-11/+58
| |\ \ \
| | * \ \ Upmerge the fix for bug#56581 from 5.1 to 5.5.Joerg Bruehe2011-02-091-11/+58
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix Bug #56581 RPM scripts use hardcoded datadir locationJoerg Bruehe2011-02-031-10/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fixing the 27072 bug, the shell snippets running before/after a RPM upgrade got expanded to look at files in the data directory and at the PID file. In this expansion, the standard locations were used. There are users who configure their installations to use non-standard locations for the data directory, the PID file, and other objects. For these users, the fix of 27072 did not work. As a result, the fact that a server was running at upgrade start was not noticed, and the new server was not started after the upgrade. With this patch, the shell snippets now try to get these locations from "my_print_defaults" before falling back to the defaults. Now, the fact that the old server is running is again noticed (even with non-standard locations), and the new server is started. Also, the upgrade log is written to the correct data directory. support-files/mysql.spec.sh: See the global comment for the purpose of this change. In tests on SuSE 11, it was found necessary to use the full path name of "my_print_defaults", it seems $PATH die not include "/usr/bin".
| * | | | Automerge from mysql-5.1 for follow-up bug#57450.Dmitry Shulga2011-02-091-0/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Follow up fix for bug#57450.Dmitry Shulga2011-02-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | batch_readline_init() was modified - make check for type of file for input stream unless target platform is WINDOWS since on this platform S_IFBLK is undefined.
| * | | | Null merge from mysql-5.1John H. Embretsen2011-02-090-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Null merge from mysql-5.0John H. Embretsen2011-02-090-0/+0
| | |\ \ \
| | | * | | Backport to 5.0: Fix for Bug#52060 - test udf fails on Snow Leopard.John H. Embretsen2011-02-092-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverse DNS lookup of "localhost" returns "broadcasthost" on Snow Leopard (Mac), and NULL on most others. Simply ignore the output, as this is not an essential part of UDF testing.
* | | | | | Merging with mysql-5.5.Mats Kindahl2011-02-0963-294/+958
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Automerge from mysql-5.1 for follow-up bug#57450.Dmitry Shulga2011-02-092-0/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Follow up fix for bug#57450.Dmitry Shulga2011-02-092-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | batch_readline_init() was modified - return an error if the input source is a directory or a block device. This follow-up is necessary because on some platforms, such as Solaris, call to read() from directory may be successful.
| * | | | | Merge mysql-5.1 -> mysql-5.5 (empty)Vasil Dimov2011-02-080-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-02-0815-175/+316
| | |\ \ \ \
| * | \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-02-0817-187/+321
| |\ \ \ \ \ \
| | * | | | | | Adjust a suppression to cover more codepaths.Vasil Dimov2011-02-081-4/+0
| | | | | | | |
| | * | | | | | Bug #59472 increase AIO requests per IO thread limit to 256 from 32Inaam Rana2011-02-071-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rb://566 approved by: Sunny When using native aio on linux each IO helper thread should be able to handle upto 256 IO requests. The number 256 is the same which is used for simulated aio as well. In case of windows where we also use native aio this limit is 32 because of OS constraints. It seems that we are using the limit of 32 for all the platforms where we are using native aio. The fix is to use 256 on all platforms except windows (when native aio is enabled on windows)
| | * | | | | | Add one more Valgrind suppression to cover a different codepathVasil Dimov2011-02-071-10/+9
| | | | | | | |
| | * | | | | | Null merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-02-070-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | This change was backported from 5.5.
| | | * | | | | Backport the fix for Bug#59875 Valgrind warning in buf0buddy.c from 5.5Vasil Dimov2011-02-071-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This warning also happens in 5.1 with a slightly different codepath.
| | * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-02-071-4/+4
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Use fun:* instead of obj:*/libz.so* because when the bundled zlib isVasil Dimov2011-02-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used (--with-zlib-dir=bundled) then there is no libz.so involved.
| | * | | | | | Fix Bug#59875 Valgrind warning in buf0buddy.cVasil Dimov2011-02-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress a bogus valgrind warning.
| | * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-02-041-0/+33
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix Bug#59874 Valgrind warning in InnoDB compression codeVasil Dimov2011-02-041-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add suppressions for a bogus valgrind warnings.
| | * | | | | | Bug#59699 - Hidden bug would cause a crash for unknown tablespace flags.unknown2011-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug would cause a crash of InnoDB if a non-standard or unknown table flags existed in a SYS_TABLES record. This is important because the next file version, Cheetah, will identify itself by expanding this field. So unless this is fixed, an older engine that tries to open a table in a tablespace with a newer file version will crash instead of report an error and refuse to open the table, as it should do. Reviewed at RB://583. Approved by Marko.
| | * | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-02-0211-141/+195
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug #55284 diagnostics: Introduce UNIV_BLOB_LIGHT_DEBUG, enabled by UNIV_DEBUGMarko Mäkelä2011-02-025-54/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | btr_rec_get_field_ref_offs(), btr_rec_get_field_ref(): New functions. Get the pointer to an externally stored field. btr_cur_set_ownership_of_extern_field(): Assert that the BLOB has not already been disowned. btr_store_big_rec_extern_fields(): Rename to btr_store_big_rec_extern_fields_func() and add the debug parameter update_in_place. All pointers to externally stored columns in the record must either be zero or they must be pointers to inherited columns, owned by this record or an earlier record version. For any BLOB that is stored, the BLOB pointer must previously have been zero. When the function completes, all BLOB pointers must be nonzero and owned by the record. rb://549 approved by Jimmy Yang
| | | * | | | | Non-functional changes (cleanup) made while narrowing down Bug #55284:Marko Mäkelä2011-02-022-58/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | row_purge(): Change the return type to void. (The return value always was DB_SUCCESS.) Remove some local variables. row_undo_mod_remove_clust_low(): Remove some local variables. rb://547 approved by Jimmy Yang
| | | * | | | | Bug #55284 diagnostics: When UNIV_DEBUG, do not tolerate garbage inMarko Mäkelä2011-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Antelope files in btr_check_blob_fil_page_type(). Unfortunately, we must keep the check in production builds, because InnoDB wrote uninitialized garbage to FIL_PAGE_TYPE until fairly recently (5.1.x). rb://546 approved by Jimmy Yang
| | | * | | | | Bug #55284 diagnostics: Enable UNIV_DEBUG_FILE_ACCESSES by UNIV_DEBUGMarko Mäkelä2011-02-025-29/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was the enabling of UNIV_DEBUG_FILE_ACCESSES that caught Bug #55284 in the first place. This is a very light piece of of debug code, and there really is no reason why it is not enabled in all debug builds. rb://551 approved by Jimmy Yang
| | * | | | | | Replay a lost change (fix for Bug#56947 InnoDB leaks memory... in 5.5)Vasil Dimov2011-02-011-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was originally done in marko.makela@oracle.com-20101011085943-50pskvsbbsujbukg but was later lost during the merge process.
| | * | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-316-34/+67
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#59230 assert 0 row_upd_changes_ord_field_binary() in post-crashMarko Mäkelä2011-01-317-34/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trx rollback or purge This patch does not relax the failing debug assertion during purge. That will be revisited once we have managed to repeat the assertion failure. row_upd_changes_ord_field_binary_func(): Renamed from row_upd_changes_ord_field_binary(). Add the parameter que_thr_t* in UNIV_DEBUG builds. When the off-page column cannot be retrieved, assert that the current transaction is a recovered one and that it is the one that is currently being rolled back. row_upd_changes_ord_field_binary(): A wrapper macro for row_upd_changes_ord_field_binary_func() that discards the que_thr_t* parameter unless UNIV_DEBUG is defined. row_purge_upd_exist_or_extern_func(): Renamed from row_purge_upd_exist_or_extern(). Add the parameter que_thr_t* in UNIV_DEBUG builds. row_purge_upd_exist_or_extern(): A wrapper macro for row_purge_upd_exist_or_extern_func() that discards the que_thr_t* parameter unless UNIV_DEBUG is defined. Make trx_roll_crash_recv_trx const. If there were a 'do not dereference' attribute, it would be appropriate as well. rb://588 approved by Jimmy Yang
| | * | | | | | Merge mysql-5.1-innodb -> mysql-5.5-innodb (empty)Vasil Dimov2011-01-300-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-3031-40/+302
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge mysql-5.5 -> mysql-5.5-innodbVasil Dimov2011-01-3031-121/+606
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ weave merge from mysql-5.1 to mysql-5.5Georgi Kodinov2011-02-0812-12/+12
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved an innodb conflict thanks to vasil.
| | * | | | | | | | weave merge of mysql-5.0 to mysql-5.1.Georgi Kodinov2011-02-080-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge from mysql-5.0.92-releaseJonathan Perkin2011-02-0824-312/+776
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge from mysql-5.1.55-releaseunknown2011-02-0841-85/+581
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Updating header copyright/README in source for 2011Karen Langford2011-01-2515-15/+15
| | | | | | | | | | | |
| * | | | | | | | | | | mergeJonathan Perkin2011-02-082-21/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bug#59979: Added --debug-server option to collectionsAnitha Gopi2011-02-082-21/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge from mysql-5.5.9-releaseJonathan Perkin2011-02-0832-74/+594
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |