summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-301-2/+2
|\ | | | | | | into mysql.com:/home/my/mysql-5.1
| * Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2006-11-302-3/+5
| | | | | | | | Don't assert if my_thread_end() is called twice (common case)
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2006-11-2712-19/+19
| |\ | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0-merge
* | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-301-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.1kent@kent-amd64.(none)2006-11-2812-19/+19
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.1-build
| * \ \ Merge mysql.com:/home/kent/bk/mysql-5.0kent@kent-amd64.(none)2006-11-275-5/+5
| |\ \ \ | | | |/ | | |/| | | | | into mysql.com:/home/kent/bk/mysql-5.1
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildkent@mysql.com/kent-amd64.(none)2006-11-277-14/+14
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/mysql-5.0
| | | * | Many files:kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-11-237-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-275-5/+5
| | |/ / | | | | | | | | | | | | Reenabled build outside source tree
| * | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2006-11-177-14/+14
| |\ \ \ | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | * | | Maintain the (old) VC project files, ehere yaSSL is concerned:joerg@trift2.2006-11-177-14/+14
| | |/ / | | | | | | | | | | | | "mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
* | | | Fixed a LOT of compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-271-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.0monty@nosik.monty.fi2006-11-222-3/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| into mysql.com:/home/my/mysql-5.1
| * | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-202-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-maintmsvensson@neptunus.(none)2006-10-241-1/+4
|\ \ | |/ | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
| * Netware uses size_t as socklen_tmsvensson@neptunus.(none)2006-10-231-1/+4
| |
* | Merge neptunus.(none):/home/msvensson/mysql/work/my50-workmsvensson@neptunus.(none)2006-10-162-5/+12
|\ \ | |/ | | | | into neptunus.(none):/home/msvensson/mysql/work/my51-work
| * yassl build fixes for hpux and netwaremsvensson@neptunus.(none)2006-10-162-5/+12
| |
| * Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-09-272-2/+2
| |\ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTLmsvensson@neptunus.(none)2006-09-272-2/+2
| | |
| * | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-09-271-2/+2
| |\ \ | | |/ | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-09-277-41/+72
| |\ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-09-2667-352/+1971
| |\ \ \ | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-213-9/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738msvensson@shellback.(none)2006-09-191-2/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
| * \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738msvensson@shellback.(none)2006-09-181-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
* | \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/work/my51-workmsvensson@neptunus.(none)2006-09-282-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/mySTLmsvensson@neptunus.(none)2006-09-282-2/+2
| | | | | | | | |
* | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-09-271-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
| * | | | | | | | Fix compile failure on Sun C++ 5.7 in yaSSL codemsvensson@neptunus.(none)2006-09-271-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_importmsvensson@neptunus.(none)2006-09-277-41/+72
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
| * | | | | | Import yaSSL version 1.4.3msvensson@neptunus.(none)2006-09-277-41/+72
| | |_|_|_|/ | |/| | | |
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_importmsvensson@neptunus.(none)2006-09-2567-352/+1971
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
| * | | | | Import yaSSL version 1.4.0msvensson@neptunus.(none)2006-09-2567-352/+1971
| | | | | |
* | | | | | Merge shellback.(none):/home/msvensson/mysql/work/my51-workmsvensson@shellback.(none)2006-09-213-9/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
| * \ \ \ \ \ Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-213-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-213-9/+4
| | | |/ / / | | |/| | |
* | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738msvensson@shellback.(none)2006-09-201-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-201-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-bug19738msvensson@shellback.(none)2006-09-191-2/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
* | | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738msvensson@shellback.(none)2006-09-191-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-191-2/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | have built - Remove the wildcard dependcy on the charset xml files
* | | | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738msvensson@shellback.(none)2006-09-181-3/+8
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | | into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
| * | | | Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738msvensson@shellback.(none)2006-09-181-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-181-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-workmsvensson@shellback.(none)2006-09-183-0/+12
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | into shellback.(none):/home/msvensson/mysql/work/my51-work
| * | | | Add directive to not update files from bitkeepermsvensson@shellback.(none)2006-09-183-0/+12
| | |_|/ | |/| |
* | | | Merge shellback.(none):/home/msvensson/mysql/work/my50-workmsvensson@shellback.(none)2006-09-151-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| | into shellback.(none):/home/msvensson/mysql/work/my51-work
| * | Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_tmsvensson@shellback.(none)2006-09-151-1/+1
| | |
| * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0grichter@bk-internal.mysql.com2006-09-023-3/+12
| |\ \ | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake