Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql.com:/home/my/mysql-5.0 | monty@narttu.mysql.fi | 2006-11-30 | 1 | -2/+2 |
|\ | | | | | | | into mysql.com:/home/my/mysql-5.1 | ||||
| * | Fixed compiler warnings | monty@mysql.com/narttu.mysql.fi | 2006-11-30 | 2 | -3/+5 |
| | | | | | | | | Don't assert if my_thread_end() is called twice (common case) | ||||
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 | kent@mysql.com/kent-amd64.(none) | 2006-11-27 | 12 | -19/+19 |
| |\ | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-merge | ||||
* | | | Fixed compiler warnings (Mostly VC++): | monty@mysql.com/narttu.mysql.fi | 2006-11-30 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed not used variables - Changed some ulong parameters/variables to ulonglong (possible serious bug) - Added casts to get rid of safe assignment from longlong to long (and similar) - Added casts to function parameters - Fixed signed/unsigned compares - Added some constructores to structures - Removed some not portable constructs Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown" (Added new parameter to net_clear() to define when we want the communication buffer to be emptied) | ||||
* | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 | kent@kent-amd64.(none) | 2006-11-28 | 12 | -19/+19 |
|\ \ \ | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build | ||||
| * \ \ | Merge mysql.com:/home/kent/bk/mysql-5.0 | kent@kent-amd64.(none) | 2006-11-27 | 5 | -5/+5 |
| |\ \ \ | | | |/ | | |/| | | | | | into mysql.com:/home/kent/bk/mysql-5.1 | ||||
| | * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build | kent@mysql.com/kent-amd64.(none) | 2006-11-27 | 7 | -14/+14 |
| | |\ \ | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0 | ||||
| | | * | | Many files: | kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se | 2006-11-23 | 7 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | Adjuster project files to reflect move of "mySTL" directory | ||||
| | * | | | ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4: | kent@mysql.com/kent-amd64.(none) | 2006-11-27 | 5 | -5/+5 |
| | |/ / | | | | | | | | | | | | | Reenabled build outside source tree | ||||
| * | | | Merge trift2.:/MySQL/M50/push-5.0 | joerg@trift2. | 2006-11-17 | 7 | -14/+14 |
| |\ \ \ | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 | ||||
| | * | | | Maintain the (old) VC project files, ehere yaSSL is concerned: | joerg@trift2. | 2006-11-17 | 7 | -14/+14 |
| | |/ / | | | | | | | | | | | | | "mySTL" has become a subdirectory of "taocrypt", was a sibling previously. | ||||
* | | | | Fixed a LOT of compiler warnings | monty@mysql.com/nosik.monty.fi | 2006-11-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing DBUG_RETURN statements (in mysqldump.c) Added missing enums Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems. | ||||
* | | | | Merge mysql.com:/home/my/mysql-5.0 | monty@nosik.monty.fi | 2006-11-22 | 2 | -3/+3 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | into mysql.com:/home/my/mysql-5.1 | ||||
| * | | Remove compiler warnings | monty@mysql.com/nosik.monty.fi | 2006-11-20 | 2 | -3/+3 |
| |/ | | | | | | | | | | | | | (Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) | ||||
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | msvensson@neptunus.(none) | 2006-10-24 | 1 | -1/+4 |
|\ \ | |/ | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint | ||||
| * | Netware uses size_t as socklen_t | msvensson@neptunus.(none) | 2006-10-23 | 1 | -1/+4 |
| | | |||||
* | | Merge neptunus.(none):/home/msvensson/mysql/work/my50-work | msvensson@neptunus.(none) | 2006-10-16 | 2 | -5/+12 |
|\ \ | |/ | | | | | into neptunus.(none):/home/msvensson/mysql/work/my51-work | ||||
| * | yassl build fixes for hpux and netware | msvensson@neptunus.(none) | 2006-10-16 | 2 | -5/+12 |
| | | |||||
| * | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-27 | 2 | -2/+2 |
| |\ | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| | * | The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL | msvensson@neptunus.(none) | 2006-09-27 | 2 | -2/+2 |
| | | | |||||
| * | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-27 | 1 | -2/+2 |
| |\ \ | | |/ | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-27 | 7 | -41/+72 |
| |\ \ | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * \ \ | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-26 | 67 | -352/+1971 |
| |\ \ \ | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * \ \ \ | Merge shellback.(none):/home/msvensson/mysql/work/my50-work | msvensson@shellback.(none) | 2006-09-21 | 3 | -9/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * \ \ \ \ | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 | msvensson@shellback.(none) | 2006-09-19 | 1 | -2/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| * \ \ \ \ \ | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 | msvensson@shellback.(none) | 2006-09-18 | 1 | -3/+8 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
* | \ \ \ \ \ \ | Merge neptunus.(none):/home/msvensson/mysql/work/my51-work | msvensson@neptunus.(none) | 2006-09-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint | ||||
| * | | | | | | | | Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL | msvensson@neptunus.(none) | 2006-09-28 | 2 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import | ||||
| * | | | | | | | | Fix compile failure on Sun C++ 5.7 in yaSSL code | msvensson@neptunus.(none) | 2006-09-27 | 1 | -2/+2 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | - Trying to use unctions declared as static being used from another file, change them to be inline | ||||
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-27 | 7 | -41/+72 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import | ||||
| * | | | | | | Import yaSSL version 1.4.3 | msvensson@neptunus.(none) | 2006-09-27 | 7 | -41/+72 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import | msvensson@neptunus.(none) | 2006-09-25 | 67 | -352/+1971 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import | ||||
| * | | | | | Import yaSSL version 1.4.0 | msvensson@neptunus.(none) | 2006-09-25 | 67 | -352/+1971 |
| | | | | | | |||||
* | | | | | | Merge shellback.(none):/home/msvensson/mysql/work/my51-work | msvensson@shellback.(none) | 2006-09-21 | 3 | -9/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint | ||||
| * \ \ \ \ \ | Merge shellback.(none):/home/msvensson/mysql/work/my50-work | msvensson@shellback.(none) | 2006-09-21 | 3 | -9/+4 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/work/my51-work | ||||
| | * | | | | | Use a direct reference to the yassl and taocrypt libtool libraries to link with | msvensson@shellback.(none) | 2006-09-21 | 3 | -9/+4 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738 | msvensson@shellback.(none) | 2006-09-20 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint | ||||
| * | | | | | | Bug#19738 "make install" tries to build files that "make" should already ↵ | msvensson@shellback.(none) | 2006-09-20 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have built - Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up. | ||||
| * | | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 | msvensson@shellback.(none) | 2006-09-19 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738 | ||||
* | | | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 | msvensson@shellback.(none) | 2006-09-19 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint | ||||
| * | | | | | | Bug#19738 "make install" tries to build files that "make" should already ↵ | msvensson@shellback.(none) | 2006-09-19 | 1 | -2/+1 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | have built - Remove the wildcard dependcy on the charset xml files | ||||
* | | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738 | msvensson@shellback.(none) | 2006-09-18 | 1 | -3/+8 |
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint | ||||
| * | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738 | msvensson@shellback.(none) | 2006-09-18 | 1 | -3/+8 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738 | ||||
| | * | | | BUG#19738 "make install" tries to build files that "make" should already ↵ | msvensson@shellback.(none) | 2006-09-18 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have built - Make built sources only depend on it's sources not the built tool | ||||
* | | | | | Merge shellback.(none):/home/msvensson/mysql/work/my50-work | msvensson@shellback.(none) | 2006-09-18 | 3 | -0/+12 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | into shellback.(none):/home/msvensson/mysql/work/my51-work | ||||
| * | | | | Add directive to not update files from bitkeeper | msvensson@shellback.(none) | 2006-09-18 | 3 | -0/+12 |
| | |_|/ | |/| | | |||||
* | | | | Merge shellback.(none):/home/msvensson/mysql/work/my50-work | msvensson@shellback.(none) | 2006-09-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | into shellback.(none):/home/msvensson/mysql/work/my51-work | ||||
| * | | Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t | msvensson@shellback.(none) | 2006-09-15 | 1 | -1/+1 |
| | | | |||||
| * | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 | grichter@bk-internal.mysql.com | 2006-09-02 | 3 | -3/+12 |
| |\ \ | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake |