summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Collapse)AuthorAgeFilesLines
* Merge polly.local:/home/kaa/src/maint/bug22364/my50-bug22364kaa@polly.local2007-04-272-0/+90
|\ | | | | | | into polly.local:/home/kaa/src/maint/bug22364/my51-bug22364
| * Fix for bug #22364 "Inconsistent "matched rows" when executing UPDATE"kaa@polly.local2007-04-234-0/+163
| | | | | | | | | | | | | | | | In multi_update::send_data(), the counter of matched rows was not correctly incremented, when during insertion of a new row to a temporay table it had to be converted from HEAP to MyISAM. This fix changes the logic to increment the counter of matched rows in the following cases: 1. If the error returned from write_row() is zero. 2. If the error returned from write_row() is non-zero, is neither HA_ERR_FOUND_DUPP_KEY nor HA_ERR_FOUND_DUPP_UNIQUE, and a call to create_myisam_from_heap() succeeds.
* | Remove the cleanup of table t1 until problem with lock is fixedmsvensson@pilot.blaudden2007-04-032-6/+4
| |
* | Replace not portable "--system rm" with --remove_filemsvensson@pilot.blaudden2007-04-031-4/+8
| |
* | Cleanup tables created by test cases msvensson@pilot.blaudden2007-04-038-0/+24
| |
* | Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-04-032-2/+8
|\ \ | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * | Work around for bug#27606msvensson@pilot.blaudden2007-04-032-2/+8
| | |
* | | Merge recycle.(none):/src/bug23491_ii/my50-bug23491_iiiggy@recycle.(none)2007-04-021-3/+3
|\ \ \ | |/ / |/| / | |/ into recycle.(none):/src/bug23491_ii/my51-bug23491_ii
| * Minor test cleanup.iggy@recycle.(none)2007-04-021-3/+3
| |
* | After merge fixmsvensson@pilot.blaudden2007-04-021-0/+2
| |
* | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1msvensson@pilot.blaudden2007-04-0275-272/+1604
|\ \ | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| * \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-022-728/+1
| |\ \ | | |/ | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.blaudden2007-04-022-728/+1
| | |\ | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | | * Cset exclude: tsmith@siva.hindu.god|ChangeSet|20070328212513|13373msvensson@pilot.blaudden2007-04-022-728/+1
| | | |
| | | * Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2msvensson@pilot.blaudden2007-03-293-40/+746
| | | |\ | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
| | * | | Fix spelling errormsvensson@pilot.blaudden2007-04-021-1/+1
| | | | |
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-04-021-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | Bug#27049 Race condition in test mysqlbinlog.testmsvensson@pilot.blaudden2007-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases to decide what params to use.
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-312-8/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | Add correct replacemsvensson@pilot.blaudden2007-03-312-8/+8
| | | | |
| * | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-311-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | Bug#27049 Race condition in test mysqlbinlog.testmsvensson@pilot.blaudden2007-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add --local-load option to avoidthat the load data file requested by mysqlbinlog end up in local var/tmp dir and not in system global tmpdir
| | * | | Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280msvensson@shellback.(none)2007-03-302-28/+14
| | | | |
| | * | | Bug#25657 mysql-test-run.pl kill itself under ActiveState perlmsvensson@shellback.(none)2007-03-302-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Read the pid from pidfile in order to be able to kill the real process instead of the pseudo process. Most platforms will have the same real_pid as pid - Kill using the real pid
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintiggy@recycle.(none)2007-03-295-3/+58
| | |\ \ \ | | | | | | | | | | | | | | | | | | into recycle.(none):/src/bug23491/my50-bug23491
| * | \ \ \ Merge bk-internal:/home/bk/mysql-5.1-new-maintmsvensson@pilot.blaudden2007-03-2915-30/+71
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | | | Update result for bug#19991msvensson@pilot.blaudden2007-03-2915-30/+71
| | | | | | |
| * | | | | | Post Merge Cleanup.iggy@recycle.(none)2007-03-291-23/+23
| | | | | | |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintiggy@recycle.(none)2007-03-295-3/+58
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into recycle.(none):/src/bug23491/my51-bug23491
| | * | | | | Merge recycle.(none):/src/bug23491/my50-bug23491iggy@recycle.(none)2007-03-295-3/+58
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | into recycle.(none):/src/bug23491/my51-bug23491
| | | * | | | Bug#23491 MySQLDump prefix function call in a view by database nameiggy@recycle.(none)2007-03-275-3/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - mysqldump executes a SHOW CREATE VIEW statement to generate the text that it outputs. When the function name is retrieved it's database name is unconditionally prepended. This change causes the function's database name to be prepended only when it was used to define the function.
| * | | | | | After merge fixesmsvensson@pilot.blaudden2007-03-296-91/+87
| | | | | | |
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug19991/my51-bug19991msvensson@pilot.blaudden2007-03-2923-82/+256
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | | | | Bug#19991 CHANGE MASTER need option ssl-verify-server-certmsvensson@pilot.blaudden2007-03-2923-82/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add MASTER_SSL_VERIFY_SERVER_CERT option to CHANGE MASTER TO - Add Master_Ssl_Serify_Server_Cert to SHOW SLAVE STATUS - Save and restore ssl_verify_server_cert to master info file setting it to disabled as default.
| * | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-292-0/+208
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
| | * | | | | | Update test result after mergemsvensson@pilot.blaudden2007-03-291-0/+4
| | | | | | | |
| | * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/bug25482/my41-bug25482-alt2msvensson@pilot.blaudden2007-03-292-0/+202
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
| | | * | | | | Bug#25482 GRANT statements are not replicated if you use ↵msvensson@pilot.blaudden2007-03-292-0/+201
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "replicate-ignore-table" - GRANT and REVOKE statments didn't have the "updating" flag set and thus statements with a table specified would not replicate if slave filtering rules where turned on. For example "GRANT ... ON test.t1 TO ..." would not replicate.
| * | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-03-291-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
| | * | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith@quadxeon.mysql.com2007-03-297-100/+827
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
| | * \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-292-1/+19
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b21976/my50-b21976
| | | * \ \ \ \ \ \ Merge mysql.com:/home/ram/work/mysql-5.0-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-292-1/+19
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b21976/my50-b21976
| * | | | | | | | | | create.result:tsmith@quadxeon.mysql.com2007-03-291-81/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post-merge test result fixup
| * | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttsmith@quadxeon.mysql.com2007-03-297-85/+818
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
| | * \ \ \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-03-292-2/+734
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
| | | * | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41tsmith@quadxeon.mysql.com2007-03-292-2/+731
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
| | | | * | | | | | | | Bug #26642: create index corrupts table definition in .frmtsmith@siva.hindu.god2007-03-282-1/+728
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Martin Friebe for finding and submitting a fix for this bug! A table with maximum number of key segments and maximum length key name would have a corrupted .frm file, due to an incorrect calculation of the complete key length. Now the key length is computed correctly (I hope) :-) MyISAM would reject a table with the maximum number of keys and the maximum number of key segments in all keys. It would allow one less than this total maximum. Now MyISAM accepts a table defined with the maximum. (This is a very minor issue.)
| | | | * | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maintramil/ram@mysql.com/ramil.myoffice.izhnet.ru2007-03-261-39/+18
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | into mysql.com:/home/ram/work/b25301/b25301.4.1
| | | * | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith@quadxeon.mysql.com2007-03-295-98/+96
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
| | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@pilot.blaudden2007-03-2912-9/+774
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
View Lorry Controller Status