summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-2414-24/+38
|\
| * Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-2438-83/+955
| |\
| * \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-2315-26/+42
| |\ \
| | * | Bug#47638 The rpl_killed_ddl test fails on WindowsHe Zhenxing2009-12-211-2/+1
| | * | Bug#43397 mysql headers redefine pthread_mutex_init Staale Smedseng2009-12-201-1/+1
| | * | Bug#30331: Table_locks_waited shows inaccurate valuesDavi Arnaut2009-12-181-1/+3
| | * | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-184-6/+6
| | * | Manual merge.Davi Arnaut2009-12-1810-17/+20
| | |\ \
| | | * | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-1712-19/+22
| | * | | Backport to 5.1 branch (next-mr revid: 2921)Magne Mahre2009-12-181-1/+1
| | * | | Merge approved bug fixJim Winstead2009-12-173-3/+15
| | |\ \ \
| | | * | | The mysql command line client ignored the --skip-column-names optionJim Winstead2009-09-213-4/+15
| | * | | | Merge with mysql-5.1-bugteam latest changesJim Winstead2009-12-1720-13/+207
| | |\ \ \ \
| | * \ \ \ \ Merge approved bug fixJim Winstead2009-12-161-2/+2
| | |\ \ \ \ \
| | | * | | | | Fix C99 aliasing violation due to mismatched types that were papered overJim Winstead2009-11-231-2/+2
* | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2446-261/+1252
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Manual merge from mysql-trunk.Alexander Nozdrin2009-12-241-1/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Postfix for Bug#37408 (fix for Bug#49898).Alexander Nozdrin2009-12-241-1/+0
| * | | | | | | | Merge default.conf from mysql-trunk.Alexander Nozdrin2009-12-231-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix default.conf.Alexander Nozdrin2009-12-231-1/+1
| * | | | | | | | Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-230-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Backporting fix for Bug#49834 from mysql-next-mr-bugfixingAlexander Nozdrin2009-12-231-1/+6
| * | | | | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-231-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-2310-41/+71
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-224-1/+42
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix build error with CMake 2.8 (mysql_stmt_next_result not exported Vladislav Vaintroub2009-12-221-0/+1
| * | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2311-42/+72
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2210-41/+71
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Auto-merge (empty) from mysql-trunk-build.Alexander Nozdrin2009-12-220-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-22144-1205/+4518
| | | | |\ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-22208-2408/+6640
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-1610-41/+71
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-1610-41/+71
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | The version is renamed:MySQL Build Team2009-12-071-1/+1
| | | | | * | | | | | | | | | | Handle the "semisync" plugin inMySQL Build Team2009-11-262-0/+26
| | | | | * | | | | | | | | | | Remove erroneous traces of the InnoDB plugin (that is 5.1 only)MySQL Build Team2009-11-181-10/+2
| | | | | * | | | | | | | | | | Change the control structures which the RPM spec file uses to governMySQL Build Team2009-11-171-2/+12
| | | | | * | | | | | | | | | | Fix not_partition.test.MySQL Build Team2009-11-172-8/+8
| | | | | * | | | | | | | | | | Disable WL#4435.MySQL Build Team2009-11-172-3/+2
| | | | | * | | | | | | | | | | Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING".MySQL Build Team2009-11-171-5/+5
| | | | | * | | | | | | | | | | The "hash_*" functions have got a prefix "my_" in 2008.MySQL Build Team2009-11-172-12/+12
| | | | | * | | | | | | | | | | In a C file, use C style comments and not C++ style.MySQL Build Team2009-11-161-1/+1
| | | | | * | | | | | | | | | | Add missing cleanup, needed for "make distcheck" to succeed.MySQL Build Team2009-11-131-1/+1
| | | | | * | | | | | | | | | | Solve a "make" rule issue in the context of dtarce and shared objects:MySQL Build Team2009-11-131-1/+4
| | * | | | | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2229-202/+1077
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | Force use of c-register in CAS instruction on x86-32 bit architecture, b-regi...Mikael Ronstrom2009-12-211-1/+1
| * | | | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Null-merge default.conf from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Null-merge default.conf from mysql-trunk.Alexander Nozdrin2009-12-210-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Null-merge default.conf from mysql-next-mr.Alexander Nozdrin2009-12-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | |
View Lorry Controller Status