summaryrefslogtreecommitdiff
path: root/mysql-test
Commit message (Expand)AuthorAgeFilesLines
* Patch for WL#3736: Extended Table, Column and Index Comments.Alexander Nozdrin2010-02-2053-504/+2552
* merge from next-mrBjorn Munch2010-02-189-0/+77444
|\
| * Merging from mysql-next-mrAlexander Barkov2010-02-17164-836/+18505
| |\
| * | WL#3090 Japanese Character Set adjustmentsAlexander Barkov2010-02-159-0/+77444
* | | upmerge 51135Bjorn Munch2010-02-181-0/+7
|\ \ \
| * \ \ upmerge 51135Bjorn Munch2010-02-181-0/+7
| |\ \ \
| | * | | Bug #51135 Please increase the maximum number of connections allowed in mysql...Bjorn Munch2010-02-171-0/+7
* | | | | merge 44054Bjorn Munch2010-02-172-15/+24
|\ \ \ \ \ | |/ / / /
| * | | | merge 44054Bjorn Munch2010-02-172-15/+24
| |\ \ \ \ | | |/ / /
| | * | | Bug #44054 MTR2: --no-reorder does not prevent reorderingBjorn Munch2010-02-172-15/+24
| * | | | merge from trunkBjorn Munch2010-02-1419-20/+277
| |\ \ \ \
* | | | | | fixed wrong merge conflict in mysql-test/include/mtr_warnings.sqlBjorn Munch2010-02-161-0/+1
* | | | | | Added a needed reap to mysql-test/include/handler.incBjorn Munch2010-02-161-0/+1
* | | | | | new merge from next-mrBjorn Munch2010-02-16164-836/+18503
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Prohibit running semi-sync rpl tests in the embedded mode.Alexander Nozdrin2010-02-166-0/+6
| * | | | | A fix and a test case for Bug#47648 "main.merge fails sporadically".Konstantin Osipov2010-02-152-8/+113
| * | | | | Auto-merge from mysql-next-4284.Alexander Nozdrin2010-02-156-284/+3
| |\ \ \ \ \
| | * | | | | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-156-284/+3
| * | | | | | Auto-merge from mysql-next-4284.Alexander Nozdrin2010-02-157-0/+176
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix for bug #51136 "Crash in pthread_rwlock_rdlock on Dmitry Lenev2010-02-155-0/+96
| | * | | | | Fix for bug #51134 "Crash in MDL_lock::destroy on a concurrent Dmitry Lenev2010-02-152-0/+80
| * | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2010-02-15171-1906/+4894
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| * | | | | Fix for bug #50908 "Assertion `handler_tables_hash.records == 0' Dmitry Lenev2010-02-123-44/+538
| * | | | | next-4284 tree: Konstantin Osipov2010-02-112-2/+9
| * | | | | Fix a sporadic failure of rpl_sp.test in next-4284 tree: when doing Konstantin Osipov2010-02-111-1/+3
| * | | | | next-4284 tree: fix the failures of processlist_val_* tests,Konstantin Osipov2010-02-113-12/+8
| * | | | | Followup to Bug#34604 handler::ha_rnd_end(): Assertion `inited==RND' failed.Jon Olav Hauglid2010-02-112-0/+2
| * | | | | Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-116-0/+647
| * | | | | Update result file.Alexander Nozdrin2010-02-101-1/+3
| * | | | | Fix for bug #50998 "Deadlock in MDL code during test Dmitry Lenev2010-02-102-0/+142
| * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-093-3/+5
| |\ \ \ \ \
| * | | | | | Fix for bug #50913 "Deadlock between open_and_lock_tables_derivedDmitry Lenev2010-02-084-0/+212
| * | | | | | Merge next-4284 -> next-4284-mergeKonstantin Osipov2010-02-063-0/+46
| |\ \ \ \ \ \
| | * | | | | | Bug #50912 Assertion `ticket->m_type >= mdl_request->type'Jon Olav Hauglid2010-02-063-0/+46
| * | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-06139-724/+4002
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge next-4284 -> next-4284-merge.Konstantin Osipov2010-02-053-0/+46
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #50907 Assertion `hash_tables->table->next == __null' on Jon Olav Hauglid2010-02-053-0/+46
| * | | | | | | | next-mr -> next-4284 merge.Konstantin Osipov2010-02-055-6/+55
| * | | | | | | | Add a suppression for use of functions unsafe in statementKonstantin Osipov2010-02-051-0/+7
| * | | | | | | | next-mr -> next-4284 merge:Konstantin Osipov2010-02-051-1/+1
| * | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-05301-10060/+52623
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-043-0/+231
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-04217-444/+13247
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Bug #50821 Deadlock between LOCK TABLES and ALTER TABLEJon Olav Hauglid2010-02-042-0/+69
| * | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0427-146/+2401
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge next-4248 -> next-4284-mergeKonstantin Osipov2010-02-032-0/+151
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #50786 Assertion `thd->mdl_context.trans_sentinel() == __null' Jon Olav Hauglid2010-02-032-0/+151
| * | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0326-84/+414
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-0351-16/+1199
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge next-4284 -> next-4284-merge.Konstantin Osipov2010-02-032-0/+29
| |\ \ \ \ \ \ \ \ \ \ \ \