summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Makefile.am:kent@mysql.com/c-4e4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-10-141-8/+8
* log_event.cc, sql_class.cc:kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-10-132-6/+6
* Merge bk-internal:/home/bk/mysql-5.1-rplmsvensson@neptunus.(none)2006-10-111-1/+1
|\
| * Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-10-111-1/+1
| |\
| | * Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0svoj@mysql.com/april.(none)2006-10-081-1/+1
| | |\
| | | * After merge fix.svoj@mysql.com/april.(none)2006-10-081-1/+1
| | * | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@may.pils.ru2006-10-083-2/+21
| | |\ \ | | | |/
| | | * Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-061-1/+14
| | | |\
| | | | * Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-061-1/+14
| | | | |\
| | | | | * BUG#22937 - Valgrind failure in 'merge' test (ha_myisammrg.cc:329)svoj@mysql.com/april.(none)2006-10-061-1/+14
| | | | * | Addition to fix for bug#10974. Fixed spelling.svoj@mysql.com/april.(none)2006-10-061-1/+1
| | * | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/gluh.(none)2006-10-051-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-09-181-1/+1
| | | |\ \ \ \
| | | | * \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-09-141-1/+1
| | | | |\ \ \ \
| | | | | * | | | Bug#20862 truncated result with show variables like 'innodb_data_file_path'gluh@mysql.com/gluh.(none)2006-09-111-1/+1
| | * | | | | | | Merge bk-internal:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-10-038-12/+27
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0kroki/tomash@moonlight.intranet2006-10-037-12/+26
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-realkroki/tomash@moonlight.intranet2006-10-037-12/+26
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fix for the patch for bug#21726: Incorrect result with multiplekroki/tomash@moonlight.intranet2006-10-037-12/+26
| | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0anozdrin/alik@booka.2006-10-031-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Added a missing breakpoint. This could causejani@ua141d10.elisa.omakaista.fi2006-10-031-0/+1
| | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-runtimemsvensson@neptunus.(none)2006-10-0316-170/+180
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-rplmsvensson@neptunus.(none)2006-10-032-112/+101
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@shellback.(none)2006-10-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintramil/ram@mysql.com/myoffice.izhnet.ru2006-10-031-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-0314-45/+203
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | / / / / / / / / | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-10-021-4/+7
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mockturtle.local2006-10-0224-61/+282
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kroki/tomash@moonlight.intranet2006-10-0211-40/+125
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-10-027-33/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtimedlenev@mockturtle.local2006-09-307-33/+73
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-09-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0kroki/tomash@moonlight.intranet2006-09-281-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-10-108-462/+1020
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-102-24/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | BUG#21474 (There is a rotation before the last table map):mats@romeo.(none)2006-10-102-24/+29
| * | | | | | | | | | | | | | | | | | Fixes to make replication team tree build on Windows.mats@romeo.(none)2006-10-101-3/+3
| * | | | | | | | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-064-250/+491
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-063-250/+488
| | * | | | | | | | | | | | | | | | | BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-021-0/+3
| * | | | | | | | | | | | | | | | | | Fix to build on 64-bit systems where sizeof(unsigned long long)mats@romeo.(none)2006-10-061-7/+4
| * | | | | | | | | | | | | | | | | | Post-merge fixes.mats@romeo.(none)2006-10-052-11/+11
| * | | | | | | | | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-053-188/+503
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | I had forgotten to delete an already disabled line of C++ code.mats@romeo.(none)2006-10-053-188/+502
* | | | | | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1jonas@perch.ndb.mysql.com2006-10-1076-1483/+3274
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1svoj@may.pils.ru2006-10-082-1/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-enginessvoj@april.(none)2006-10-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Addition to fix for bug#10974. Fixed spelling.svoj@mysql.com/april.(none)2006-10-061-1/+1
| | * | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-enginessvoj@april.(none)2006-10-051-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-10-051-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | / / | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | |