summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* (no commit message)unknown2012-12-070-0/+0
|
* Bug#15912213: BUFFER OVERFLOW IN ACL_GET()Harin Vadodaria2012-12-061-1/+20
| | | | | | | | | Description: A very large database name causes buffer overflow in functions acl_get() and check_grant_db() in sql_acl.cc. It happens due to an unguarded string copy operation. This puts required sanity checks before copying db string to destination buffer.
* Bug #15948123: SERVER WORKS INCORRECT WITH LONG TABLE ALIASESGleb Shchepa2012-12-051-2/+0
| | | | | After-push cleanup: removal of unneeded assertions.
* Bug #15948123: SERVER WORKS INCORRECT WITH LONG TABLE ALIASESGleb Shchepa2012-12-052-2/+9
| | | | | | | | | | | Code in MDL subsystem assumes that identifiers of objects can't be longer than NAME_LEN characters. This assumption was broken when one tried to construct MDL_key based on table alias, which can have arbitrary length. Since MDL_key's (and MDL locks) are not really used for table aliases this patch changes code to not initialize MDL_key object for table list element representing aliases.
* Building RPMs for ULN:Joerg Bruehe2012-11-081-11/+15
| | | | | | | The patch "mysql-chain-certs.patch" needs to be adapted to code changes in "vio/viosslfactories.c" which were done in MySQL 5.5.
* Placement change:Joerg Bruehe2012-11-0823-2/+2
| | | | | | | | | Top level "SPECIFIC-ULN/" was inappropriate, put the files to create RPMs for ULN into "packaging/rpm-uln/".
* merge 5.1 => 5.5Tor Didriksen2012-11-012-1/+2
|\
| * Bug#14840488 VALGRIND ERRORS IN MYSQL_CLIENT_TESTTor Didriksen2012-11-012-1/+2
| | | | | | | | | | | | Add missing DBUG_RETURNs, otherwise the debug-stack gets messed up, and _db_enter_ and _db_exit_ will access data outside the current stack frame.
* | BUG#13556441: CHECK AND REPAIR TABLE SHOULD BE MORE ROBUST [4]Venkata Sidagam2012-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem description: mysql server crashes when we run repair table on currupted table. Analysis: The problem with this bug seem to be key_reflength out of bounds (186 according to debugger). We read this value from meta-data segment of .MYI file while doing mi_open(). If you look into _mi_kpointer() you can see that the upper limit for key_reflength is 7. Solution: In mi_open() there is a line like: if (share->base.keystart > 65535 || share->base.rec_reflength > 8) we should verify key_reflength here as well.
* | BUG#14485479: Merge into mysql-5.5 branchAshish Agarwal2012-10-313-2/+26
|\ \
| * | BUG#14485479: INSTALL AUDIT PLUGIN HANGS IF WE TRY TOAshish Agarwal2012-10-313-2/+26
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DISABLE AND ENABLED DURING DDL OPERATION PROBLEM: Same thread trying to acquire the same mutex second time leads to hang/server crash. While [un]installing audit_log plugin a thread acquires the LOCK_plugin mutex and after successful initialization tries to write in mysql.plugin table. It holds this mutex for a long time. If some how plugin table is corrupted then a write to plugin table will throw an error, thread try to log this error in the audit_log plugin, doing so it tries to acquire the mutex again and results is server hang/crash. SOLUTION: Releasing the LOCK_plugin mutex before writing in mysql.plugin table. We dont need to hold this mutex as thread already acquired a TL_WRITE lock on mysql.plugin table.
* | BUG#11754894: MYISAMCHK ERROR HAS INCORRECT REFERENCE Anirudh Mangipudi2012-10-300-0/+0
|\ \ | |/ | | | | | | TO MYISAM_SORT_BUFFER_SIZE Null Merge from 5.1 to 5.5
| * BUG#11754894: MYISAMCHK ERROR HAS INCORRECT REFERENCE Anirudh Mangipudi2012-10-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | TO 'MYISAM_SORT_BUFFER_SIZE' Problem: 'myisam_sort_buffer_size' is a parameter used by mysqld program only whereas 'sort_buffer_size' is used by mysqld and myisamchk programs. But the error message printed when myisamchk program is run with insufficient buffer size is myisam_sort_buffer_size is too small which may mislead to the server parameter myisam_sort_buffer_size. SOLUTION: A parameter 'myisam_sort_buffer_size' is added as an alias for 'sort_buffer_size' and the 'sort_buffer_size' parameter is marked as deprecated. So myisamchk also has both the parameters with the same role.
* | BUG#11754894: MYISAMCHK ERROR HAS INCORRECT REFERENCE Anirudh Mangipudi2012-10-301-1/+8
|\ \ | | | | | | | | | | | | TO 'MYISAM_SORT_BUFFER_SIZE' Merging from 5.1 to 5.5
| * | BUG#11754894: MYISAMCHK ERROR HAS INCORRECT REFERENCE Anirudh Mangipudi2012-10-301-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TO 'MYISAM_SORT_BUFFER_SIZE' Problem: 'myisam_sort_buffer_size' is a parameter used by mysqld program only whereas 'sort_buffer_size' is used by mysqld and myisamchk programs. But the error message printed when myisamchk program is run with insufficient buffer size is myisam_sort_buffer_size is too small which may mislead to the server parameter myisam_sort_buffer_size. SOLUTION: A parameter 'myisam_sort_buffer_size' is added as an alias for 'sort_buffer_size' and the 'sort_buffer_size' parameter is marked as deprecated. So myisamchk also has both the parameters with the same role.
* | | BUG#14659685: main.mysqlbinlog_row_myisam.test ↵Shivji Kumar Jha2012-10-3016-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | main.mysqlbinlog_row_innodb.test are skipped merge from 5.1 into 5.5
| * | BUG#14659685 - main.mysqlbinlog_row_myisam andShivji Kumar Jha2012-10-3016-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main.mysqlbinlog_row_innodb are skipped by mtr === Problem === The following tests are wrongly placed in main suite and as a result these are not run with proper binlog format combinations. Some are always skipped by mtr. 1) mysqlbinlog_row_myisam 2) mysqlbinlog_row_innodb 3) mysqlbinlog_row.test 4) mysqlbinlog_row_trans.test 5) mysqlbinlog-cp932 6) mysqlbinlog2 7) mysqlbinlog_base64 === Background === mtr runs the tests placed in main suite with binlog format=stmt. Those that need to be tested against binlog format=row or mixed or more than one binlog format and require only one mysql server are placed in binlog suite. mtr runs tests in binlog suite with all three binlog formats(stmt,row and mixed). === Fix === 1) Moved the test listed in problem section above to binlog suite. 2) Added prefix "binlog_" to the name of each test case moved. Renamed the coresponding result files and option files accordingly. mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc: include file for mysqlbinlog_row_myisam.test and mysqlbinlog_row_myisam.test which are being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result: result file for mysqlbinlog-cp932.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result: result file for mysqlbinlog2.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result: result file for mysqlbinlog_base64.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result: result file for mysqlbinlog_row.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result: result file for mysqlbinlog_row_innodb.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result: result file for mysqlbinlog_row_myisam.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result: result file for mysqlbinlog_row_trans.test which is being moved to binlog suite. mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt: option file for mysqlbinlog-cp932.test which is being moved to binlog suite. mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test: the test requires binlog format=stmt or mixed. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was never run with binlog format=mixed. mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test: the test requires binlog format=stmt or mixed. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was never run with binlog format=mixed. mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr.
* | | (no commit message)unknown2012-10-290-0/+0
| | |
* | | (no commit message)unknown2012-10-290-0/+0
|\ \ \ | |/ /
| * | (no commit message)unknown2012-10-290-0/+0
| | |
* | | (no commit message)unknown2012-10-290-0/+0
| | |
* | | Merge from 5.1.Alexander Nozdrin2012-10-292-9/+11
|\ \ \ | |/ /
| * | Fix sp_notembedded.test.Alexander Nozdrin2012-10-292-11/+11
| | |
* | | Bug#14737559 BZR JOIN PLUGIN TREES INTO INTERNAL/PLUGINTor Didriksen2012-10-244-1/+7
| | | | | | | | | | | | | | | | | | Part three: Fix some search paths.
* | | local mergeTor Didriksen2012-10-2312-32/+170
|\ \ \
| * | | Use MESSAGE(STATUS ...) as we don't want any popup from the build system.Tor Didriksen2012-10-232-2/+2
| | | |
| * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-221-1/+5
| |\ \ \ | | |/ /
| | * | Backport from 5.6: Bug#14769820 ASSERT FLEN == LENMarko Mäkelä2012-10-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IN ALTER TABLE ... ADD UNIQUE KEY A bogus debug assertion failure occurred when reporting a duplicate key on a column prefix of a CHAR column. This is a regression from Bug#14729221 IN-PLACE ALTER TABLE REPORTS '' INSTEAD OF REAL DUPLICATE VALUE FOR PREFIX KEYS. The assertion is only present when UNIV_DEBUG is defined (which it is in debug builds starting from MySQL 5.5). It is a case of overasserting. Fix approved by Inaam Rana on IM.
| * | | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-212-9/+16
| |\ \ \ | | |/ / | | | | | | | | Merge from mysql-5.1 into mysql-5.5.
| | * | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-212-9/+16
| | | | | | | | | | | | | | | | | | | | Moved explicit instantiation of available_buffer and valid_buffer_range template functions to sql/log_event.cc.
| * | | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-210-0/+0
| |\ \ \ | | |/ / | | | | | | | | Null merge from mysql-5.1 into mysql-5.5.
| | * | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-213-7/+86
| | |\ \ | | | | | | | | | | | | | | | Merge bundle on mysql-5.1.
| * | \ \ BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-213-7/+86
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge bundle on mysql-5.5.
| | * \ \ \ BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-123-7/+86
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | Merge from mysql-5.1 into mysql-5.5.
| | | * | | BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-123-7/+86
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug had two problems: P1) Reads out of bounds; P2) Writes out of bounds. PROBLEM P1 ---------- User_var_log_event unmarshalling from binlog was not performing range checks when using name_len and val_len variables to walk on event buffer. Added range checks to User_var_log_event unmarshalling to prevent unmarshalling errors. PROBLEM P2 ---------- User_var_log_event value was allocated on thread stack, what caused stack frame errors when User_var_log_event value was bigger than thread stack size. Currently value is allocated on heap memory.
| * | | | Fix formatting in 'INFO_BIN' on Windows - backport.Joerg Bruehe2012-10-191-3/+5
| | | | |
| * | | | Upmerge a backport - emptyJoerg Bruehe2012-10-190-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Automerge into main 5.1Joerg Bruehe2012-10-191-3/+18
| | |\ \ \
| | | * | | Backport this change from MySQL 5.5 to 5.1:Joerg Bruehe2012-09-111-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL The script is different from what's used on unixes. It was not playing the table insertion script (mysql_system_tables_data.sql), although it was checking for the presence of this script. Fixed by re-enabling the lookup for this file and replaying it at bootstrap time. Note that on the Unixes "SELECT @@hostname" does return a fully qualified name, whereas on Windows it returns only a hostname. So by default we're filtering records in the mysql.user table until we ensure this is fixed. The change was coded in 5.5 by Georgi Kodinov <Georgi.Kodinov@Oracle.com>
| * | | | | Bug #14226171 EXCESSIVE ROW LOCKING WITH UPDATE IN 5.5.25Annamalai Gurusami2012-10-191-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a DML statement is issued, and if the index merge access method is chosen, then many rows from the storage engine will be locked because of the way the algorithm works. Many rows will be locked, but they will not be part of the final result set. To reduce the excessive locking, the locks of unmatched rows are released by this patch. This patch will affect only transactions with isolation level equal to or less stricter than READ COMMITTED. This is because of the behaviour of ha_innobase::unlock_row(). rb://1296 approved by jorgen and olav.
| * | | | | Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE_BLOBNeeraj Bisht2012-10-181-7/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- When we execute a query which has subquery with GROUP BY, ORDER BY and have a BLOB column,results a memory leak. Analysis:- In case of subquery, which have GROUP BY on BLOB and a ORDER BY on other field and BLOB is not a key. We allocate a tmp buffer to copy_field to take care of BLOB value.This copy_field value can have copies of its in two join(objects), so while freeing this copy_field we have to take care that it is not deleted twice. The double deletion of tmp_table_param.copy_field is handled by two patches. One by Kostja : revid:sp1r-konstantin@mysql.com-20050627101056-55153 Fix the broken test suite in -debug build. and other by Oleksandr revid:sp1r-bell@sanja.is.com.ua-20060118114857-19905 Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851). both of this patches are commited in different branch and while merging they both get placed,but there is no need for Kostja patch as Oleksandr patch handle this. sql/sql_select.cc: Bug13726751, tmp_join clean up is not necessary as later in the code we are taking care of cleaning up of tmp_join copy_field.
| | * | | | Bug#13726751 - 8 BYTE MEMORY LEAK IN DO_SAVE_BLOBNeeraj Bisht2012-10-181-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem:- When we execute a query which has subquery with GROUP BY, ORDER BY and have a BLOB column,results a memory leak. Analysis:- In case of subquery, which have GROUP BY on BLOB and a ORDER BY on other field and BLOB is not a key. We allocate a tmp buffer to copy_field to take care of BLOB value.This copy_field value can have copies of its in two join(objects), so while freeing this copy_field we have to take care that it is not deleted twice. The double deletion of tmp_table_param.copy_field is handled by two patches. One by Kostja : revid:sp1r-konstantin@mysql.com-20050627101056-55153 Fix the broken test suite in -debug build. and other by Oleksandr revid:sp1r-bell@sanja.is.com.ua-20060118114857-19905 Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851). both of this patches are commited in different branch and while merging they both get placed,but there is no need for Kostja patch as Oleksandr patch handle this. sql/sql_select.cc: Bug13726751, tmp_join clean up is not necessary as later in the code we are taking care of cleaning up of tmp_join copy_field.
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-10-181-7/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#14758405: ALTER TABLE: ADDING SERIAL NULL DATATYPE: ASSERTION:Marko Mäkelä2012-10-183-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LEN <= SIZEOF(ULONGLONG) This bug was caught in the WL#6255 ALTER TABLE...ADD COLUMN in MySQL 5.6, but there is a bug in all InnoDB versions that support auto-increment columns. row_search_autoinc_read_column(): When reading the maximum value of the auto-increment column, and the column only contains NULL values, return 0. This corresponds to the case when the table is empty in row_search_max_autoinc(). rb:1415 approved by Sunny Bains
| * | | | | merge from mysql-5.1 -> mysql-5.5Krunal Bauskar krunal.bauskar@oracle.com2012-10-172-0/+148
| |\ \ \ \ \ | | |/ / / /
| | * | | | bug#14765606: ensure select is active before killing it else kill signal is ↵Krunal Bauskar krunal.bauskar@oracle.com2012-10-172-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | ignored
| * | | | | removing .... will re-add using merge. for some reason initial mysql-5.1 ↵Krunal Bauskar krunal.bauskar@oracle.com2012-10-172-131/+0
| | | | | | | | | | | | | | | | | | | | | | | | version is not connected to mysql-5.5
| * | | | | NULL mergeTatjana Azundris Nuernberg2012-10-170-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysqld_safe script did not heed MySQL specific environment variable $UMASK, leading to divergent behavior between mysqld and mysqld_safe. Patch adds an approximation of mysqld's behavior to mysqld_safe, within the bounds dictated by attempt to have mysqld_safe run on even the most basic of shells (proper '70s sh, not just bash with a fancy symlink). Patch also adds approximation of said behavior to mysqld_multi (in perl). (backport)
| | | \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
*-----. \ \ \ \ \ \ (no commit message)unknown2012-10-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |