summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bug #56921 It should be possible to log connection statements in mysqltestBjorn Munch2010-09-223-17/+56
| | | | | | | Added --enable-connect-log, somewhet similar to --enable-query-log If query log is disabled, disable connect log too Also some related cleanup in mysqltest.test: removing duplicate test loop
* test fixes after 56753Bjorn Munch2010-09-212-3/+12
|
* Bug #55426 mysqltest crashes when trying to unlock not acquired mutexBjorn Munch2010-09-201-0/+3
| | | | | | Follow-up: don't call pthread_join() on Windows This change only valid for 5.1
* Bug #56753 mtr silently ignores junk after backticksBjorn Munch2010-09-155-3/+29
| | | | | When stepping backward to end of `` expression, check for illegal chars
* Bug #55426 mysqltest crashes when trying to unlock not acquired mutexBjorn Munch2010-09-141-3/+10
| | | | | | | | Bug #55546 mysqltest fails to create a new thread on HPUX Missing call to pthread_join(), in embedded mode This independently solves both problems, see 55426 for details. Addendum: cannot test against a pthread_t, adds boolean flag instead
* Bug #56647 Valgrind warnings for memory leak in mysqltest.ccBjorn Munch2010-09-101-2/+1
| | | | | Moved an init_dynamic_string() from before to after potential die()
* Bug #56383 provide option to restart mysqld after each mtr testBjorn Munch2010-08-311-0/+8
| | | | | Added --force-restart
* merge 55413Bjorn Munch2010-08-303-2/+21
|\
| * Bug #55413 mysqltest gives parse error for lines matching "^let.*\\.*;$"Bjorn Munch2010-08-103-2/+21
| | | | | | | | | | | | Allow escaped quotes also in statements not starting with -- But will not support single unescaped ' or `
* | Bug #55178 Set timeout on test-to-test-basisBjorn Munch2010-08-302-4/+21
| | | | | | | | | | Allow --testcase-timeout=<mins> to be set in .opt file for test
* | Cherry pick 55501Bjorn Munch2010-08-251-0/+1
| |
* | Bug #52301 Add --protocol to mysqltestBjorn Munch2010-08-251-0/+6
|/ | | | | | | Added code resulted in strange linking problem for embedded on Windows Avoided by not doing this for embedded mode It's irrelevant for embedded server anyway, --protocol will be ignored
* merge from 5.1Bjorn Munch2010-08-04286-2406/+12157
|\
| * Merge the version number increase (5.1.49 -> 5.1.50) into the main tree.Joerg Bruehe2010-07-211-1/+1
| |\
| | * Raise version number after cloning 5.1.49unknown2010-07-061-1/+1
| | |
| * | fix tree namesGeorgi Kodinov2010-07-191-3/+3
| | |
| * | 5.1.49 push to mysql-5.1MySQL Build Team2010-07-190-0/+0
| |\ \
| | * \ Null-merge from mysql-5.1.46sp1-releaseunknown2010-07-080-0/+0
| | |\ \
| | | * | Backport into build-201006221614-5.1.46sp1sunanda2010-06-237-29/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3392.1.1 > revision-id: gshchepa@mysql.com-20100521184732-0jvpzinv0uwyvr2d > parent: sven.sandberg@sun.com-20100520153801-yyhujm1qqa4eyfn0 > committer: Gleb Shchepa <gshchepa@mysql.com> > branch nick: 53804-5.1 > timestamp: Fri 2010-05-21 22:47:32 +0400 > message: > Bug #53804: serious flaws in the alter database .. upgrade > data directory name command > > The check_db_name function has been modified to validate tails of > #mysql50#-prefixed database names for compliance with MySQL 5.0 > database name encoding rules (the check_table_name function call > has been reused).
| | | * | Backport into build-201006221614-5.1.46sp1sunanda2010-06-231-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3386 > revision-id: sergey.glukhov@sun.com-20100518082821-yajhvbv1ghmlpu1n > parent: aelkin@mysql.com-20100516170332-x8priwrdjwolc065 > committer: Sergey Glukhov <Sergey.Glukhov@sun.com> > branch nick: mysql-5.1-bugteam > timestamp: Tue 2010-05-18 13:28:21 +0500 > message: > Bug#48729 SELECT ... FROM INFORMATION_SCHEMA.ROUTINES causes memory to grow > Analysis showed that in case of accessing I_S table > ROUTINES we perform unnecessary allocations > with get_field() function for every processed row that > in their turn causes significant memory growth. > the fix is to avoid use of get_field().
| | | * | Backport into build-201006221614-5.1.46sp1sunanda2010-06-239-8/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3367 [merge] > revision-id: joro@sun.com-20100504140328-srxf3c088j2twnq6 > parent: kristofer.pettersson@sun.com-20100503172109-f9hracq5pqsaomb1 > parent: joro@sun.com-20100503151651-nakknn8amrapmdp7 > committer: Georgi Kodinov <joro@sun.com> > branch nick: B53371-5.1-bugteam > timestamp: Tue 2010-05-04 17:03:28 +0300 > message: > Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants. > > This is the 5.1 merge and extension of the fix. > The server was happily accepting paths in table name in all places a table > name is accepted (e.g. a SELECT). This allowed all users that have some > privilege over some database to read all tables in all databases in all > mysql server instances that the server file system has access to. > Fixed by : > 1. making sure no path elements are allowed in quoted table name when > constructing the path (note that the path symbols are still valid in table names > when they're properly escaped by the server). > 2. checking the #mysql50# prefixed names the same way they're checked for > path elements in mysql-5.0. > ------------------------------------------------------------ > Use --include-merges or -n0 to see merged revisions.
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-224-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3351.41.1 > revision-id: alexey.kopytov@sun.com-20100430111048-jdls6ofn4kkmpt09 > parent: sergey.glukhov@sun.com-20100329134249-03wyhzp5k92dzhcb > committer: Alexey Kopytov <Alexey.Kopytov@Sun.com> > branch nick: my51-bug48419 > timestamp: Fri 2010-04-30 15:10:48 +0400 > message: > Bug #48419: another explain crash.. > > WHERE predicates containing references to empty tables in a > subquery were handled incorrectly by the optimizer when > executing EXPLAIN. As a result, the optimizer could try to > evaluate such predicates rather than just stop with > "Impossible WHERE noticed after reading const tables" as > it would do in a non-subquery case. This led to valgrind > errors and crashes. > > Fixed the code checking the above condition so that subqueries > are not excluded and hence are handled in the same way as top > level SELECTs.
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-223-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 1810.3987.14 > revision-id: davi.arnaut@sun.com-20100429132816-ictyul6d75itek22 > parent: ramil@mysql.com-20100429044232-f0pkyx8fnpszf142 > committer: Davi Arnaut <Davi.Arnaut@Sun.COM> > branch nick: 50974-5.0 > timestamp: Thu 2010-04-29 10:28:16 -0300 > message: > Bug#50974: Server keeps receiving big (> max_allowed_packet) packets indefinitely. > > The server could be tricked to read packets indefinitely if it > received a packet larger than the maximum size of one packet. > This problem is aggravated by the fact that it can be triggered > before authentication. > > The solution is to no skip big packets for non-authenticated > sessions. If a big packet is sent before a session is authen- > ticated, a error is returned and the connection is closed. > ------------------------------------------------------------ > revno: 3363 [merge] > revision-id: davi.arnaut@sun.com-20100429231819-i3anwzrdasjmezvt > parent: davi.arnaut@sun.com-20100401131522-895y8uzvv8ag44gs > parent: davi.arnaut@sun.com-20100429132816-ictyul6d75itek22 > committer: Davi Arnaut <Davi.Arnaut@Sun.COM> > branch nick: mysql-5.1-bugteam > timestamp: Thu 2010-04-29 20:18:19 -0300 > message: > Manual merge. > ------------------------------------------------------------ > Use --include-merges or -n0 to see merged revisions.
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 1810.3987.13 > revision-id: ramil@mysql.com-20100429044232-f0pkyx8fnpszf142 > parent: alexey.kopytov@sun.com-20100426200600-op06qy98llzpzgl1 > committer: Ramil Kalimullin <ramil@mysql.com> > branch nick: b53237-5.0-bugteam > timestamp: Thu 2010-04-29 08:42:32 +0400 > message: > Fix for bug #53237: mysql_list_fields/COM_FIELD_LIST stack smashing > > Problem: "COM_FIELD_LIST is an old command of the MySQL server, before there was real move to only > SQL. Seems that the data sent to COM_FIELD_LIST( mysql_list_fields() function) is not > checked for sanity. By sending long data for the table a buffer is overflown, which can > be used deliberately to include code that harms". > > Fix: check incoming data length. The patch did not apply cleanly: - Line numbers are completely off, roughly it is 2030 -> 1313 - What is called "pend" in the patch, is "arg_end" in the source.
| | | * | Backport into 5.1.46sp1:MySQL Build Team2010-06-222-0/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > revno: 3351.14.56 > committer: Marko Mdkeld <marko.makela@oracle.com> > branch nick: 5.1-innodb > timestamp: Mon 2010-04-26 14:08:56 +0300 > message: > Add a test case for Bug #52745.
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-222-2/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3351.14.47 > revision-id: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a > parent: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn > committer: Marko Mäkelä <marko.makela@oracle.com> > branch nick: 5.1-innodb > timestamp: Wed 2010-04-21 12:50:33 +0300 > message: > dtuple_convert_big_rec(): Store locally any fields whose maximum length > is less than 256 bytes. (Bug #52745) > Add related comments and debug assertions to the "offsets" > functions in rem0rec.c. > Approved by Sunny Bains
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3351.47.2 > revision-id: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo > parent: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9 > committer: Marko Mäkelä <marko.makela@oracle.com> > branch nick: mysql-5.1-innodb2 > timestamp: Tue 2010-05-11 13:49:10 +0300 > message: > btr_page_split_and_insert(): Add an assertion > suggested by Sunny Bains when reviewing Bug #52964.
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3351.47.1 > revision-id: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9 > parent: vasil.dimov@oracle.com-20100510132852-cz457uqvj8iiy9mm > committer: Marko Mäkelä <marko.makela@oracle.com> > branch nick: mysql-5.1-innodb2 > timestamp: Tue 2010-05-11 13:45:00 +0300 > message: > Remove a stray expression. Spotted by Sunny Bains.
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3351.14.74 > revision-id: marko.makela@oracle.com-20100504093128-44v6glupe1dsh0ug > parent: marko.makela@oracle.com-20100503122859-k73bl51re93o0mt4 > committer: Marko Mäkelä <marko.makela@oracle.com> > branch nick: 5.1-innodb > timestamp: Tue 2010-05-04 12:31:28 +0300 > message: > btr_page_split_and_insert(): Correct the fix of Bug #52964. > When split_rec==NULL, choose the correct node pointer key (first_rec).
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-221-32/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3351.14.50 > revision-id: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7 > parent: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d > committer: Marko Mäkelä <marko.makela@oracle.com> > branch nick: 5.1-innodb > timestamp: Wed 2010-04-21 21:53:59 +0300 > message: > btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964) > > btr_page_tuple_smaller(): New function, refactored from > btr_page_split_and_insert(). > > btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec(). > Note that a NULL return may mean that the tuple is to be inserted into > either the lower or upper page, to be determined by btr_page_tuple_smaller(). > > btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL, > invoke btr_page_tuple_smaller() to determine which half-page the tuple > belongs to. > > Reviewed by Sunny Bains
| | | * | Backport into build-201006221614-5.1.46sp1MySQL Build Team2010-06-225-25/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > ------------------------------------------------------------ > revno: 3362 > revision-id: davi.arnaut@sun.com-20100401131522-895y8uzvv8ag44gs > parent: ramil@mysql.com-20100429045409-r7r5lcyiruis15v7 > committer: Davi Arnaut <Davi.Arnaut@Sun.COM> > branch nick: 50755-5.1 > timestamp: Thu 2010-04-01 10:15:22 -0300 > message: > Bug#50755: Crash if stored routine def contains version comments > > The problem was that a syntactically invalid trigger could cause > the server to crash when trying to list triggers. The crash would > happen due to a mishap in the backup/restore procedure that should > protect parser items which are not associated with the trigger. The > backup/restore is used to isolate the parse tree (and context) of > a statement from the load (and parsing) of a trigger. In this case, > a error during the parsing of a trigger could cause the improper > backup/restore sequence. > > The solution is to properly restore the original statement context > before the parser is exited due to syntax errors in the trigger body.
| | | * | Set version number for mysql-5.1.46sp1 releaseunknown2010-06-221-1/+1
| | | | |
| * | | | Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.unknown2010-07-092-5/+25
| | | | |
| * | | | rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run ↵sunanda2010-07-071-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | default suites was not complete. Bootstrap failed to pick up necessary files needed by test and hence all tests failed.
| * | | Merge mysql-5.1-innodb -> mysql-5.1-securityVasil Dimov2010-07-04111-693/+7586
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 . There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a failure for a test added in one of them. If that is resolved quickly then those 8 more changesets will be merged too.
| | * | | Fix bug#54583. This change reverses rsvn:1350 by getting rid of a bogus ↵Sunny Bains2010-06-256-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assertion and clarifies the invariant in dict_table_get_on_id(). In Mar 2007 Marko observed a crash during recovery, the crash resulted from an UNDO operation on a system table. His solution was to acquire an X lock on the data dictionary, this in hindsight was an overkill. It is unclear what caused the crash, current hypothesis is that it was a memory corruption. The X lock results in performance issues by when undoing changes due to rollback during normal operation on regular tables. Why the change is safe: ====================== The InnoDB code has changed since the original X lock change was made. In the new code we always lock the data dictionary in X mode during startup when UNDOing operations on the system tables (this is a given). This ensures that the crash Marko observed cannot happen as long as all transactions that update the system tables follow the standard rules by setting the appropriate DICT_OP flag when writing the log records when they make the changes. If transactions violate the above mentioned rule then during recovery (at startup) the rollback code (see trx0roll.c) will not acquire the X lock and we will see the crash again. This will however be a different bug.
| | * | | Merge a lost changeset inaam.rana@oracle.com-20100624124843-m7ouqwe5zqcqapn1Vasil Dimov2010-06-250-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (no changed files)
| | | * \ \ mergeInaam Rana2010-06-2413-127/+432
| | | |\ \ \
| | * | \ \ \ Merge a lost changeset inaam.rana@oracle.com-20100624124450-2m3mg1238ewvakgxVasil Dimov2010-06-251-0/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Add ChangeLog for bug#39168Inaam Rana2010-06-241-0/+7
| | | | | | |
| | * | | | | Merge a lost changeset marko.makela@oracle.com-20100624104820-p4ojmxcmq8qeos6dVasil Dimov2010-06-251-0/+6
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Add ChangeLog entry for Bug#54679Marko Mäkelä2010-06-241-0/+6
| | | | | | |
| | * | | | | Merge a lost changeset marko.makela@oracle.com-20100624104620-pklunowaigv7quu9Vasil Dimov2010-06-253-79/+268
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug#54679: alter table causes compressed row_format to revert to compactMarko Mäkelä2010-06-243-79/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_innobase::create(): Add the local variable row_type = form->s->row_type. Adjust it to ROW_TYPE_COMPRESSED when ROW_FORMAT is not specified or inherited but KEY_BLOCK_SIZE is. Observe the inherited ROW_FORMAT even when it is not explicitly specified. innodb_bug54679.test: New test, to test the bug and to ensure that there are no regressions. (The only difference in the test result without the patch applied is that the first ALTER TABLE changes ROW_FORMAT to Compact.)
| | * | | | | Merge a lost changeset jimmy.yang@oracle.com-20100624021010-oh2hnp8e1xbaax6uVasil Dimov2010-06-257-77/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Move the fix for bug #54044 to security branch, and revert commit -r3520:3521.Jimmy Yang2010-06-237-77/+4
| | |/ / / /
| | * | | | Port fix for "bug #54044 Create temporary tables and using innodb crashes"Jimmy Yang2010-06-224-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to 5.1 plugin codeline. rb://378, approved by Marko
| | * | | | Fix bug #54044, Create temporary tables and using innodb crashes. ScreenJimmy Yang2010-06-223-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | out NULL type columns, and return without creating the table. rb://378 approved by Marko
| | * | | | Merge mysql-5.1-innodb from bk-internal to my local treeVasil Dimov2010-06-222-0/+13
| | |\ \ \ \
| | | * | | | ChangeLog for Bug#54686 "field->col->mtype == type" assertion error at ↵Marko Mäkelä2010-06-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | row/row0sel.c