summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-06-223-65/+46
|\
| * Patch to handle some bad situations resulting from the fix for BUG#19995.unknown2006-06-223-65/+46
* | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-06-227-11/+79
|\ \
| * \ Merge dator5.(none):/home/pappa/clean-mysql-5.1unknown2006-06-217-11/+79
| |\ \ | | |/ | |/|
| | * Merge dator5.(none):/home/pappa/clean-mysql-5.1unknown2006-06-217-11/+79
| | |\
| | | * BUG#19309: Problem with calling proecdures twiceunknown2006-06-214-11/+31
| | | * Merge dator5.(none):/home/pappa/bug16000unknown2006-06-202-0/+12
| | | |\
| | | | * Merge dator5.(none):/home/pappa/clean-mysql-5.1unknown2006-06-202-0/+12
| | | | |\
| | | | | * BUG#16000: .par file not removed plus errors to error log for normal errorsunknown2006-06-202-0/+12
| | | * | | Merge dator5.(none):/home/pappa/bug19309unknown2006-06-201-2/+37
| | | |\ \ \
| | | | * \ \ Merge dator5.(none):/home/pappa/clean-mysql-5.1unknown2006-06-201-2/+37
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | BUG#19309: Crash if double procedural alterunknown2006-06-151-2/+37
| | | * | | | Merge dator5.(none):/home/pappa/clean-mysql-5.1unknown2006-06-201-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge dator5.(none):/home/pappa/clean-mysql-5.1unknown2006-06-201-0/+1
| | | | |\ \ \
| | | | | * | | BUG#19281: Auto-increment disappeared after create indexunknown2006-06-151-0/+1
* | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-06-2112-202/+456
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rplunknown2006-06-216-34/+42
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2006-06-191-7/+29
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#19881: slave cores at close_temporary_tables under shutdownunknown2006-06-191-7/+29
| * | | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rplunknown2006-06-1911-194/+427
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | After merge fixesunknown2006-06-163-5/+4
| | * | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rplunknown2006-06-1611-192/+426
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixing code to avoid compile problem on Solaris (aCC).unknown2006-06-151-75/+83
| | | * | | | | | | Bug#19066 (DELETE FROM replication inconsistency for NDB):unknown2006-06-132-1/+2
| | | * | | | | | | Merge mysql.com:/home/bkroot/mysql-5.1-new-rplunknown2006-06-132-29/+12
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug#19066 (DELETE FROM inconsistency for NDB):unknown2006-06-012-28/+12
| | | * | | | | | | | Fixed BUG#18948 "Disabled test case rpl_row_inexist_tbl".unknown2006-06-051-29/+7
| | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2006-06-021-27/+172
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Applied innodb-5.1-ss594 snapshot.unknown2006-06-011-27/+172
| | | * | | | | | | | Bug#19995 (Extreneous table maps generated for statements that does not gener...unknown2006-06-021-6/+17
| | | * | | | | | | | Bug#19995 (Extreneous table maps generated for statements that do not generat...unknown2006-05-315-74/+109
| | | |/ / / / / / /
| | | * | | | | | | After merge fixesunknown2006-05-173-8/+6
| | | * | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-newunknown2006-05-178-13/+61
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug#16837 (Missing #ifdef cause compile problem --without-row-based-replicati...unknown2006-05-1610-13/+76
| | | | |/ / / / / /
* | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-06-213-25/+24
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Fixed failed automergeunknown2006-06-211-1/+0
| * | | | | | | | | Merge mysql.com:/home/marty/MySQL/mysql-5.0-backedunknown2006-06-212-2/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix for Bug #19906 REPLACE doesn't update TEXT fields correctlyunknown2006-06-212-3/+10
| * | | | | | | | | | Merge mysql.com:/home/alik/MySQL/devel/5.0-to-be-mergedunknown2006-06-201-23/+20
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge mysql.com:/home/alik/MySQL/devel/5.0-rtunknown2006-06-191-23/+20
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/alik/MySQL/devel/5.0-treeunknown2006-06-191-23/+20
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix for bug#13479 "REPLACE activates UPDATE trigger, not the DELETE andunknown2006-06-161-23/+20
* | | | | | | | | | | | | after merge fixesunknown2006-06-213-7/+18
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-06-201-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0unknown2006-06-201-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Addition to fix forunknown2006-06-191-1/+6
| | * | | | | | | | | | Merge april:devel/BitKeeper/mysql-5.0-enginesunknown2006-06-191-3/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1unknown2006-06-191-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge april:devel/BitKeeper/mysql-4.1unknown2006-06-191-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | BUG#18036 - update of table joined to self reports table as crashedunknown2006-06-191-1/+1