| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Manual merge | istruewing@stella.local | 2008-03-14 | 116 | -435/+1800 |
| |\ | |||||
| | * | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | kaa@kaamos.(none) | 2008-03-13 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures | kaa@kaamos.(none) | 2008-03-13 | 1 | -1/+4 |
| | * | | Fixed test failures caused by insufficient cleanups in the tests for | kaa@kaamos.(none) | 2008-03-12 | 2 | -2/+2 |
| | * | | Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt | kaa@kaamos.(none) | 2008-03-12 | 2 | -3/+29 |
| | |\ \ | |||||
| | | * \ | Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt | mhansson/martin@riffraff.(none) | 2008-03-11 | 2 | -3/+29 |
| | | |\ \ | |||||
| | | | * | | Bug #34367: sql/sql_show.cc: create_schema_table should handle | mhansson/martin@riffraff.(none) | 2008-03-07 | 2 | -3/+29 |
| | * | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | kaa@kaamos.(none) | 2008-03-12 | 1 | -7/+1 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Re-enabled the test for mysql_insert_id() after merging from main. | kaa@kaamos.(none) | 2008-03-12 | 1 | -7/+1 |
| | * | | | | Post-merge fix. | kaa@kaamos.(none) | 2008-03-12 | 1 | -2/+2 |
| | * | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | kaa@kaamos.(none) | 2008-03-12 | 1 | -1/+0 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge kaamos.(none):/data/src/opt/mysql-4.1-opt | kaa@kaamos.(none) | 2008-03-12 | 0 | -0/+0 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge kaamos.(none):/data/src/mysql-4.1 | kaa@kaamos.(none) | 2008-03-12 | 7 | -46/+124 |
| | | | |\ \ \ | |||||
| | | * | \ \ \ | Merge kaamos.(none):/data/src/mysql-5.0 | kaa@kaamos.(none) | 2008-03-12 | 81 | -398/+1334 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | Merge kaamos.(none):/data/src/mysql-5.1 | kaa@kaamos.(none) | 2008-03-12 | 117 | -713/+2026 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | kaa@kaamos.(none) | 2008-03-11 | 3 | -4/+66 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | / / | | | |_|_|_|/ / | | |/| | | | | | |||||
| | | | * | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | tnurnberg@white.intern.koehntopp.de | 2008-03-10 | 7 | -14/+74 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | tnurnberg@white.intern.koehntopp.de | 2008-03-10 | 1 | -1/+3 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge kaamos.(none):/data/src/opt/bug34889/my50 | kaa@kaamos.(none) | 2008-03-08 | 2 | -1/+18 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | gkodinov/kgeorge@magare.gmz | 2008-03-07 | 4 | -0/+9 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | sergefp@pslp.mylan | 2008-03-06 | 3 | -3/+67 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | BUG#34945: "ref_or_null queries that are null_rejecting and have a null value... | sergefp@mysql.com | 2008-03-03 | 3 | -3/+67 |
| | | * | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-opt | holyfoot/hf@hfmain.(none) | 2008-03-11 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | Bug #32801 wait_timeout.test fails randomly | holyfoot/hf@mysql.com/hfmain.(none) | 2008-03-03 | 1 | -1/+0 |
| | | * | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | tnurnberg@white.intern.koehntopp.de | 2008-03-10 | 7 | -14/+74 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/misc/mysql/34749/50-34749 | tnurnberg@white.intern.koehntopp.de | 2008-03-10 | 7 | -14/+74 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | Bug#34749: Server crash when using NAME_CONST() with an aggregate function | tnurnberg@mysql.com/white.intern.koehntopp.de | 2008-02-28 | 7 | -14/+74 |
| | | * | | | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | tnurnberg@white.intern.koehntopp.de | 2008-03-10 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/misc/mysql/29645/50-29645 | tnurnberg@white.intern.koehntopp.de | 2008-03-10 | 1 | -1/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | Bug#29645: Link failure when using the embedded server | tnurnberg@mysql.com/white.intern.koehntopp.de | 2008-02-25 | 1 | -1/+3 |
| | | * | | | | | | | | | | | | | | Merge kaamos.(none):/data/src/opt/bug34889/my51 | kaa@kaamos.(none) | 2008-03-08 | 1 | -0/+16 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge kaamos.(none):/data/src/opt/bug34889/my50 | kaa@kaamos.(none) | 2008-03-08 | 1 | -0/+16 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | Fix for bug #34889: mysql_client_test::test_mysql_insert_id test fails | kaa@kaamos.(none) | 2008-03-05 | 2 | -1/+18 |
| | | * | | | | | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt | gkodinov/kgeorge@magare.gmz | 2008-03-07 | 4 | -0/+9 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | Bug #34909: mysqldump returns a 0 status on error when using | gkodinov/kgeorge@magare.gmz | 2008-03-07 | 4 | -0/+9 |
| | | * | | | | | | | | | | | | | | | Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt | kaa@kaamos.(none) | 2008-03-03 | 1 | -3/+17 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge kaamos.(none):/data/src/opt/mysql-5.0-opt | kaa@kaamos.(none) | 2008-03-03 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | Merge kaamos.(none):/data/src/opt/bug31781/my50 | kaa@kaamos.(none) | 2008-03-03 | 1 | -3/+17 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | Merge kaamos.(none):/data/src/opt/bug31781/my51 | kaa@kaamos.(none) | 2008-03-03 | 1 | -3/+17 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge kaamos.(none):/data/src/opt/bug31781/my50 | kaa@kaamos.(none) | 2008-03-03 | 1 | -3/+17 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | | | | Fix for bug #31781: multi-table UPDATE with temp-pool enabled fails | kaa@kaamos.(none) | 2008-03-03 | 1 | -3/+17 |
| | | * | | | | | | | | | | | | | | | | | fixed test case problem on win | gluh@mysql.com/mgluh.(none) | 2008-03-03 | 4 | -66/+66 |
| | | |/ / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | test case fix | gluh@mysql.com/mgluh.(none) | 2008-03-03 | 4 | -48/+46 |
| | | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/mysql-5.0-opt | gluh@mgluh.(none) | 2008-03-03 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | test case fix | gluh@mysql.com/mgluh.(none) | 2008-03-03 | 2 | -8/+8 |
| | | | * | | | | | | | | | | | | | | | Merge host.loc:/home/uchum/work/5.0-opt-34830 | gshchepa/uchum@host.loc | 2008-03-01 | 1 | -4/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Merge host.loc:/home/uchum/work/5.0-opt-34830 | gshchepa/uchum@host.loc | 2008-03-01 | 1 | -4/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | / / / / / | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | Fixed bug #34830: mixed table and field names in Item_ref | gshchepa/uchum@host.loc | 2008-02-29 | 1 | -4/+4 |
| | | * | | | | | | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt | gluh@eagle.(none) | 2008-02-29 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | wrong merge fix | gluh@mysql.com/eagle.(none) | 2008-02-29 | 1 | -2/+0 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |