kent@kent-amd64.(none)
2264dc7da0
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-28 18:31:53 +01:00
kent@kent-amd64.(none)
e99c548bcd
Merge mysql.com:/home/kent/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/mysql-5.1
2006-11-27 23:12:05 +01:00
kent@mysql.com/kent-amd64.(none)
5fcb7a4ef1
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 21:21:00 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86
ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:
...
Reenabled build outside source tree
2006-11-27 21:15:25 +01:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
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.
2006-11-27 01:47:38 +02:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f1ec3372be
Many files:
...
Adjuster project files to reflect move of "mySTL" directory
2006-11-23 20:04:18 +01:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(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 #)
2006-11-20 22:42:06 +02:00
joerg@trift2.
16cb323429
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-11-17 16:33:11 +01:00
joerg@trift2.
0aee63517e
Maintain the (old) VC project files, ehere yaSSL is concerned:
...
"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
2006-11-17 16:09:37 +01:00
msvensson@neptunus.(none)
33a200d73d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 12:53:47 +02:00
msvensson@neptunus.(none)
38c66b638f
Netware uses size_t as socklen_t
2006-10-23 13:26:04 +02:00
msvensson@neptunus.(none)
b2a98c531f
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-10-16 18:40:54 +02:00
msvensson@neptunus.(none)
85fb3817f7
yassl build fixes for hpux and netware
2006-10-16 18:36:33 +02:00
msvensson@neptunus.(none)
8399b9e155
Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 09:38:26 +02:00
msvensson@neptunus.(none)
d4799d9edd
Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL
2006-09-28 09:37:34 +02:00
msvensson@neptunus.(none)
912075ba4d
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 17:00:25 +02:00
msvensson@neptunus.(none)
593fdc3f9b
The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL
2006-09-27 16:51:59 +02:00
msvensson@neptunus.(none)
161b64def2
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 16:47:59 +02:00
msvensson@neptunus.(none)
d1f7bc0971
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-27 16:46:38 +02:00
msvensson@neptunus.(none)
ca0b8c552a
Fix compile failure on Sun C++ 5.7 in yaSSL code
...
- Trying to use unctions declared as static being used from another file, change them to be inline
2006-09-27 16:45:44 +02:00
msvensson@neptunus.(none)
312b4de035
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-27 14:44:06 +02:00
msvensson@neptunus.(none)
980268df03
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-27 14:38:25 +02:00
msvensson@neptunus.(none)
e4676ef60a
Import yaSSL version 1.4.3
2006-09-27 14:36:12 +02:00
msvensson@neptunus.(none)
85cdcc8ea4
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-26 16:04:16 +02:00
msvensson@neptunus.(none)
bcdecd96b7
Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-09-25 16:46:37 +02:00
msvensson@neptunus.(none)
64a64d0fbf
Import yaSSL version 1.4.0
2006-09-25 16:40:29 +02:00
msvensson@shellback.(none)
e8a31531f0
Merge shellback.(none):/home/msvensson/mysql/work/my51-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-21 12:38:58 +02:00
msvensson@shellback.(none)
08cdf195ce
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-21 12:25:35 +02:00
msvensson@shellback.(none)
c39d8cb04d
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-21 11:38:51 +02:00
msvensson@shellback.(none)
346730ee6b
Use a direct reference to the yassl and taocrypt libtool libraries to link with
2006-09-21 11:37:08 +02:00
msvensson@shellback.(none)
475c3c843e
Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-20 09:36:16 +02:00
msvensson@shellback.(none)
91844fb81f
Bug#19738 "make install" tries to build files that "make" should already have built
...
- Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.
2006-09-20 09:28:12 +02:00
msvensson@shellback.(none)
de3a2e9237
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-19 08:22:42 +02:00
msvensson@shellback.(none)
49275c0cad
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-19 08:18:40 +02:00
msvensson@shellback.(none)
e7fe105df8
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
2006-09-19 08:17:34 +02:00
msvensson@shellback.(none)
efcb56cb79
Bug#19738 "make install" tries to build files that "make" should already have built
...
- Remove the wildcard dependcy on the charset xml files
2006-09-19 08:15:42 +02:00
msvensson@shellback.(none)
dcb83c8300
Merge shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-18 21:55:56 +02:00
msvensson@shellback.(none)
d94fa53682
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-18 21:55:20 +02:00
msvensson@shellback.(none)
af323655b7
Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738
...
into shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738
2006-09-18 21:15:38 +02:00
msvensson@shellback.(none)
b50c843b25
BUG#19738 "make install" tries to build files that "make" should already have built
...
- Make built sources only depend on it's sources not the built tool
2006-09-18 21:11:34 +02:00
msvensson@shellback.(none)
da8fb51350
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-18 19:40:12 +02:00
msvensson@shellback.(none)
2b014bedaf
Add directive to not update files from bitkeeper
2006-09-18 19:37:22 +02:00
msvensson@shellback.(none)
e03619ce63
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 15:45:03 +02:00
msvensson@shellback.(none)
c3e2d543db
Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t
2006-09-15 15:41:04 +02:00
cmiller@zippy.cornsilk.net
e5669a6527
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-05 13:53:06 -04:00
cmiller@zippy.cornsilk.net
1b60377484
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-05 13:52:06 -04:00
grichter@bk-internal.mysql.com
6993e3a3f7
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
5686da41ac
Fixes for crashes and test failures
2006-09-01 14:34:37 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e
make dist changes for Cmake build
2006-09-01 10:32:12 +02:00