Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2009-12-16 | 1 | -1/+0 |
|\ | |||||
| * | Remove .cvsignore files (attempt #2). | Alexander Nozdrin | 2009-12-16 | 1 | -1/+0 |
* | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 3 | -44/+48 |
|\ \ | |/ | |||||
| * | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 2 | -2/+4 |
| |\ | |||||
| * | | Post-merge fixes: fix typo and remove unused variables. | Davi Arnaut | 2009-11-21 | 1 | -1/+0 |
| * | | Bug#47571 : idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-20 | 2 | -42/+47 |
| * | | merge | Vladislav Vaintroub | 2009-11-03 | 1 | -59/+2 |
| |\ \ | |||||
* | \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-03 | 3 | -36/+227 |
|\ \ \ \ | |||||
| * | | | | Fix typo (s/_WIN_/__WIN__). | Alik | 2009-11-25 | 1 | -1/+1 |
| * | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0. | Alexander Nozdrin | 2009-11-25 | 3 | -36/+227 |
* | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 1 | -0/+24 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Backport the implementation of vio_pending from 6.0-codebase. | Konstantin Osipov | 2009-11-21 | 1 | -0/+24 |
* | | | | | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 3 | -8/+204 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 3 | -8/+204 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | The FIONREAD macro could expand to a expression which | Davi Arnaut | 2009-11-10 | 1 | -1/+2 |
| | * | | | Backport of Bug#41860 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 3 | -7/+160 |
| | * | | | Backport of Bug#10374 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -4/+45 |
* | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 1 | -59/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 4 | -98/+115 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -59/+2 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | merge | Georgi Kodinov | 2009-10-27 | 1 | -59/+2 |
| | | |\ | |||||
| | | | * | merge from 4.1 | Georgi Kodinov | 2009-10-27 | 1 | -59/+2 |
| | | | |\ | |||||
| | | | | * | Bug #47320: OpenSSL client does not check YaSSL server certificate | Georgi Kodinov | 2009-10-20 | 1 | -51/+2 |
| | | | | * | Merge 192.168.0.10:mysql/mysql-4.1-maint | msvensson@pilot.mysql.com | 2007-02-06 | 2 | -12/+1 |
| | | | | |\ | |||||
| | | | | | * | Bug#22943 syscall pruning in libmysql | msvensson@pilot.mysql.com | 2007-01-29 | 2 | -12/+1 |
| | | | | * | | Valgrind error fixes | gluh@mysql.com/eagle.(none) | 2007-02-01 | 1 | -0/+4 |
| | | | | |/ | |||||
* | | | | | | merge | Vladislav Vaintroub | 2009-11-02 | 3 | -38/+113 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Bug#47571: idle named pipe connection is unkillable | Vladislav Vaintroub | 2009-11-02 | 3 | -39/+113 |
| |/ / / | |||||
* | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | backport of | Vladislav Vaintroub | 2009-09-30 | 1 | -2/+2 |
* | | | | Backport http://lists.mysql.com/commits/57778 | Vladislav Vaintroub | 2009-09-30 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge from 5.0 | Staale Smedseng | 2009-07-23 | 1 | -18/+42 |
|\ \ \ | |/ / | |||||
| * | | Bug #45770 errors reading server SSL files are printed, but | Staale Smedseng | 2009-07-23 | 1 | -18/+42 |
* | | | Bug#33899: Deadlock in mysql_real_query with shared memory connections | Davi Arnaut | 2009-03-26 | 1 | -7/+15 |
|\ \ \ | |/ / | |||||
| * | | Bug#33899: Deadlock in mysql_real_query with shared memory connections | Davi Arnaut | 2009-03-26 | 1 | -7/+13 |
| * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -1/+1 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build | iggy@alf.(none) | 2008-02-21 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Bug#31929 Windows build fails with >=4 Parallel build threads. | iggy@alf.(none) | 2008-01-29 | 1 | -0/+1 |
* | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build | guilhem@gbichot4.local | 2008-02-18 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> | guilhem@gbichot4.local | 2008-02-18 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pilot.mysql.com:/data/msvensson/mysql/bug25988/my50-bug25988 | msvensson@pilot.mysql.com | 2008-02-07 | 1 | -14/+21 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Bug#33050 5.0.50 fails many SSL testcases | msvensson@pilot.mysql.com | 2008-02-07 | 1 | -14/+21 |
* | | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint | msvensson@pilot.(none) | 2007-08-28 | 1 | -96/+46 |
|\ \ \ | |/ / | |||||
| * | | Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117 | msvensson@pilot.(none) | 2007-08-28 | 1 | -96/+46 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel | jbruehe/mysqldev@mysql.com/production.mysql.com | 2007-08-16 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js: | kent@mysql.com/kent-amd64.(none) | 2007-08-06 | 1 | -1/+7 |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | monty@narttu.mysql.fi | 2007-08-14 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris | monty@mysql.com/nosik.monty.fi | 2007-08-13 | 1 | -1/+1 |
* | | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files. | joerg@trift2. | 2007-07-31 | 1 | -0/+0 |
|/ / / |