summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-mergelars/lthalmann@dl145k.mysql.com2006-08-010-0/+0
|\
| * Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-mergelars/lthalmann@mysql.com/dl145j.mysql.com2006-08-010-0/+0
| |\
| | * Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpllars/lthalmann@mysql.com/dl145j.mysql.com2006-07-311-9/+6
| | |\
| * | \ Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145j.mysql.com2006-07-313-11/+9
| |\ \ \
| | * | | Removing temporary changes.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-282-2/+2
| | * | | Temporary changes just to check some points (will be restored).aivanov/alexi@mysql.com/mysqld.localdomain2006-07-282-2/+2
* | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145j.mysql.com2006-07-3135-1382/+1488
|\ \ \ \ \
| * | | | | Make innodb_thread_concurrency 0 by default.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-301-1/+1
| * | | | | Make innodb_flush_log_at_trx_commit a settable global variable.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-296-9/+12
| * | | | | Make innodb_thread_concurrency 0 by default, and extendaivanov/alexi@mysql.com/mysqld.localdomain2006-07-291-2/+4
| * | | | | Removing temporary changes.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-282-2/+2
| * | | | | Temporary changes just to check one point (will be restored)aivanov/alexi@mysql.com/mysqld.localdomain2006-07-282-2/+2
| * | | | | Applied innodb-5.1-ss660 snapshot.aivanov/alexi@mysql.com/mysqld.localdomain2006-07-2629-1370/+1471
| * | | | | Merge mysql.com:/home/alexi/innodb/mysql-5.0-workaivanov@mysqld.localdomain2006-07-260-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Applied innodb-5.0-ss660 snapshot.aivanov@mysql.com2006-07-263-11/+9
| | * | | | Merge mysql.com:/home/alexi/innodb/mysql-4.1-workaivanov@mysql.com2006-07-260-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Applied innodb-4.1-ss32 snapshot.aivanov@mysql.com2006-07-261-9/+6
* | | | | | Fix tests after merge and disable rpl_ndb_dd_advance due to bug 18679.jimw@rama.(none)2006-07-284-123/+24
* | | | | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-28126-248/+1265
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0holyfoot/abotchkov@production.mysql.com2006-07-189-37/+58
| |\ \ \ \ \
| | * | | | | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-185-19/+6
| | * | | | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-188-32/+66
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-138-48/+74
| | | |\ \ \ \
| | | | * | | | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-018-48/+74
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/my50-maint-yassl-20060717msvensson@neptunus.(none)2006-07-1893-51/+609
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge shellback.(none):/home/msvensson/mysql/my50-yasslmsvensson@shellback.(none)2006-07-1793-51/+609
| | |\ \ \ \ \ \
| | | * | | | | | Import yaSSL version 1.3.7msvensson@shellback.(none)2006-07-1793-57/+627
| * | | | | | | | Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461pekka@orca.ndb.mysql.com2006-07-151-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 4.1 -> 5.0 mergeigreenhoe/greenman@anubis.greendragongames.com2006-07-141-3/+2
| * | | | | | | | | Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0igreenhoe/greenman@anubis.greendragongames.com2006-07-1419-137/+243
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 4.1 -> 5.0 merge fixesigreenhoe/greenman@anubis.greendragongames.com2006-07-145-29/+14
| | * | | | | | | | | 4.1 -> 5.0 mergeigreenhoe/greenman@anubis.greendragongames.com2006-07-1319-124/+245
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.(none)2006-07-132-4/+9
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1mkindahl@dl145k.mysql.com2006-07-121-3/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ | | | | | |/| | | | | |
| | | | * | | | | | | | Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@maint1.mysql.com2006-07-123-2/+14
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006cmiller@zippy.(none)2006-07-111-1/+4
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Add a more reliable "getconf" test for Linuxthreads. The later trees should ...cmiller@zippy.(none)2006-07-071-6/+15
| | | | | * | | | | | | | | Bug#19006: 4.0 valgrind problems (in test func_str)cmiller@zippy.(none)2006-07-014-3/+22
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintcmiller@zippy.(none)2006-07-1355-141/+2708
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.(none)2006-07-113-2/+14
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | ndb - bug#20847: non-debug compile fixpekka@orca.ndb.mysql.com2006-07-101-0/+4
| | | | * | | | | | | | | | Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41pekka@orca.ndb.mysql.com2006-07-1045-102/+2217
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1pekka@orca.ndb.mysql.com2006-07-1030-64/+365
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug19835ingo/mydev@chilla.local2006-07-081-0/+3
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug17877ingo/mydev@chilla.local2006-07-086-7/+98
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug14400ingo/mydev@chilla.local2006-07-082-9/+21
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug11824ingo/mydev@chilla.local2006-07-082-6/+35
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2006-07-075-1/+47
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | Bugs#17647: Trouble with "create database"bar@mysql.com2006-05-045-1/+47
| | | | | | * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@bodhi.netgear2006-07-076-7/+75
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status