Commit graph

178 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
0684dc1342 Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
- Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs 
   to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
2005-10-18 15:43:59 +02:00
petr@mysql.com
5423ab00de Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels. For more details see
bug 2030. Will push a proper fix later
2005-10-17 05:14:03 +04:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
2005-10-16 06:49:19 +02:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
2005-10-12 00:58:22 +03:00
serg@serg.mylan
2e2d18b7cf Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-10-09 19:10:19 +02:00
serg@serg.mylan
ba169f81e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-10-08 16:59:41 +02:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
petr@mysql.com
54db9bab7c fix compile failure (which shows up in cygwin environment) 2005-10-07 20:25:51 +04:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
jani@ua141d10.elisa.omakaista.fi
17e87da298 Some fixes including implicit declaration of a function,
using wrong type in assignment etc.
2005-10-04 18:20:57 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
43b544a968 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
2005-09-30 12:36:23 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
aa08fd0d0a Small fixes. 2005-09-30 12:35:12 +03:00
kent@mysql.com
3b906e73d8 portability.h:
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
2005-09-29 19:37:03 +02:00
kent@mysql.com
cef2b507c7 portability.h:
Define SHUT_RDWR for OpenServer 5
2005-09-27 08:28:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8d3036c35e Some minor fixes revealed as warnings by
Intel compiler.
2005-09-23 21:28:56 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
acf218b708 Several fixes revelaled by Intel compiler. 2005-09-23 16:47:08 +03:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
petr@mysql.com
6168d0d52c fix warnings 2005-09-20 03:14:07 +04:00
reggie@fedora.(none)
66e6453e2a some last minute Windows compile fixes and makefile corrections 2005-09-15 14:32:01 -05:00
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
2005-09-14 09:43:56 +02:00
reggie@ubuntu.(none)
31be8fb694 fixed the service bits of the IM 2005-09-13 14:53:19 -05:00
reggie@linux.site
6985adffc1 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  linux.site:/home/reggie/bk/mysql-5.0-new
2005-09-13 12:59:20 -06:00
paul@frost.snake.net
dc287e7caa Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
into  frost.snake.net:/private/tmp/merge-5.1
2005-09-10 19:30:02 -05:00
paul@frost.snake.net
c26dd3057c options.cc:
Fix typo.
2005-09-10 16:01:26 -05:00
reggie@linux.site
eced05c3cd A few changes to fix compiling on Windows 2005-09-06 18:06:06 -06:00
brian@zim.(none)
57403ddc9d Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
2005-08-30 14:40:02 -07:00
konstantin@mysql.com
2c9db925fa Remove a no longer used header. 2005-08-29 23:32:47 +04:00
konstantin@mysql.com
344144ad14 Cleanup the instance manager code. 2005-08-29 23:29:35 +04:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
konstantin@mysql.com
c75cfc358e Fix a -ansi -pedantic compile failure. 2005-08-22 18:59:47 +04:00
petr@mysql.com
5605117d4d Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash"
Recommited with post-review fixes
2005-08-19 17:19:12 +04:00
jimw@mysql.com
68d5420d7c Clean up merge from 4.1 2005-08-15 14:19:56 -07:00
joerg@mysql.com
880bbb0406 Manual merge of 5.0.11 changes into 5.1.1 - use "local" files in cases of conflict. 2005-08-15 19:51:01 +02:00
reggie@linux.site
3e964a18d2 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  linux.site:/home/reggie/bk/mysql-5.0-new
2005-08-10 05:02:37 -06:00
reggie@linux.site
153ad3f687 changes to IM code that came from Petr's review 2005-08-09 07:57:40 -06:00
reggie@linux.site
88ebfb5bc6 removing trailing spaces 2005-08-09 07:57:39 -06:00
reggie@linux.site
7fa1779d62 fixed assignments to meet server coding guidelines 2005-08-09 07:57:38 -06:00
reggie@linux.site
2a00611f9c changes to IM that came from Petr and JimW's review. 2005-08-09 07:57:37 -06:00
reggie@linux.site
850f53bbf4 small corrections to the IM. 2005-08-09 07:57:36 -06:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
joerg@mysql.com
294aa66d92 New "Instance Manager" code:
Rename "port.h" to "portability.h" to avoid conflict with system header file name,
and include the file in "Makefile.am".
2005-08-05 20:44:52 +02:00
petr@mysql.com
ee6109e95f post-review fix 2005-08-05 17:48:37 +04:00
petr@mysql.com
21a1f466ba chmod -x new IM files 2005-08-05 17:09:02 +04:00
petr@mysql.com
22ccfb4d67 IM port cleanup 2005-08-05 17:02:06 +04:00
petr@mysql.com
a64f264e4b IM port fixes: fix crash on startup, add more error checking, get rid of unnecessary code. 2005-08-05 14:35:30 +04:00
reggie@fedora.(none)
72c0a021e9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into  fedora.(none):/home/reggie/bk/im_patch
2005-08-04 09:33:44 -05:00
reggie@fedora.(none)
8cb3bd41c8 alot of formatting changes that came out of JimW's review 2005-08-03 16:20:27 -05:00
ndbdev@dl145b.mysql.com
e4c53b737e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-22 02:56:25 +02:00
petr@mysql.com
9644bc3e2b Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only." 2005-07-21 22:40:53 +04:00