Commit graph

58539 commits

Author SHA1 Message Date
Vladislav Vaintroub
b73763e0f9 Backport of the patch
http://lists.mysql.com/commits/57725

Vladislav Vaintroub	2008-11-03
Cleanup CMakeLists.txt(s) - remove winsock2 (ws2_32) from 
TARGET_LINK_LIBRARIES. 
      
Every exe or dll linked with mysys needs ws2_32, because
mysys uses winsock function WSAStartup in my_init().
However, there is no need to explicitely add ws2_32 to
the list of TARGET_LINK_LIBRARIES multiple times. 
Visual Studio comes with a handy pragma that tells linker
to add library. So patch replaces bunch of ws2_32 in 
CMakeLists with  single pragma comment(lib,"ws2_32")
in my_init.c
      
Additionally, reference to non-existing "debug" library
has been removed from TARGET_LINK_LIBRARIES. The correct
name of the library is "dbug".
2009-09-30 03:39:37 +02:00
Vladislav Vaintroub
2bc1930c6c Windows improvements : manual backport of
htttp://lists.mysql.com/commits/50957?f=plain
      
Always use TLS functions instead of __declspec(thread) to access 
thread local storage variables.
The change removes the necessity to recomplile the same source
files twice -  with USE_TLS for DLLs and without USE_TLS for EXEs.
Real benefit of this change is better readability and maintainability
of TLS functions within MySQL.
              
There is a performance loss using TlsXXX functions compared to __declspec 
but the difference is negligible in practice. In a sysbench-like benchmark 
I ran with with TlsGetValue, pthread_[get|set]_specific was called 600000000 
times and took 0.17sec of total 35min CPU time, or 0.008%.
2009-09-30 03:22:57 +02:00
Vladislav Vaintroub
28a7d5042b fix tree name 2009-09-30 03:21:00 +02:00
Georgi Kodinov
e004e26624 merge mysql-trunk-wl4444_4571 to mysql-wl3220-next-mr 2009-09-29 10:34:37 +03:00
Joerg Bruehe
a6f7fbb850 Merge 5.1-build up into 5.4-build ("trunk-build"). 2009-09-28 11:39:36 +02:00
Joerg Bruehe
d609fdf98b Upmerge 5.0-build -> 5.1-build. 2009-09-28 11:07:31 +02:00
Joerg Bruehe
d4aa9e8763 Merge main 5.1 into 5.1-build (a fix from 5.1.39). 2009-09-28 10:52:28 +02:00
Joerg Bruehe
b80e34fe00 Merge the fix for bug#47137 into 5.0-build
Solaris binary packages should be compiled with '-g0', not '-g'
2009-09-28 10:43:26 +02:00
Mikael Ronstrom
ccae404afa Merge to mysql-next-mr 2009-09-28 09:39:50 +02:00
Georgi Kodinov
2118bd104c Ported WL#3220 to mysql-next-mr. 2009-09-28 10:21:25 +03:00
Alexander Nozdrin
a8edd0aabb Update default.conf. 2009-09-28 00:54:22 +04:00
Alexander Nozdrin
bc11a8d044 Merge from mysql-next-mr. 2009-09-25 18:58:53 +04:00
Alexander Nozdrin
db5c088b45 Merge from mysql-trunk (update default.conf). 2009-09-25 13:47:58 +04:00
Alexander Nozdrin
3baea8b9e8 Update default.conf 2009-09-25 13:42:54 +04:00
Alexander Nozdrin
c991aa4e1a Merge from mysql-trunl-alik. 2009-09-25 13:40:53 +04:00
Alexander Nozdrin
3f0caab6e5 Mark rpl.rpl_innodb_bug30888 experimental. 2009-09-25 13:40:25 +04:00
Alexander Nozdrin
20430985f9 Merge from mysql-trunl-alik. 2009-09-25 13:23:30 +04:00
Alexander Nozdrin
350fad0e46 Mark rpl.rpl_trigger experimental. 2009-09-25 13:21:49 +04:00
Alexander Nozdrin
f4b49e55cd Merge from mysql-trunk-alik (stabilizing changes). 2009-09-24 16:40:09 +04:00
Alexander Nozdrin
63b2a5ac78 Merge from mysql-next-mr. 2009-09-24 16:38:47 +04:00
Alexander Nozdrin
b893cc510c Disable ndb and rpl_ndb test suites from regular tests. 2009-09-24 16:30:13 +04:00
Alexander Nozdrin
45921153db Mark some tests experimental.
Update default.conf.
2009-09-24 16:29:29 +04:00
Vladislav Vaintroub
626bac8471 merge mysql-next-mr-alik 2009-09-24 12:35:16 +02:00
Vladislav Vaintroub
2b2ef99ebf merge 2009-09-23 22:19:11 +02:00
Vladislav Vaintroub
7ddb103b8e merge 2009-09-23 22:15:22 +02:00
Alexander Nozdrin
4e83ce7ce7 Merge from mysql-trunk. 2009-09-23 22:52:21 +04:00
Alexander Nozdrin
41a8a63857 Update disabled.def files. 2009-09-23 22:50:13 +04:00
Alexander Nozdrin
b0220ff9ff Ignore a new symbolic link. 2009-09-23 18:02:39 +04:00
Alexander Nozdrin
ff83a42853 Merge mysql-trunk-signal (into mysql-next-mr-alik, which is mysql-next-mr). 2009-09-23 17:57:39 +04:00
Alexander Nozdrin
7947948c52 Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
8b9361663d Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
44927973c0 Merge from mysql-trunk. 2009-09-23 14:10:04 +04:00
Alexander Nozdrin
7cd113e57c Update default.conf. 2009-09-23 14:08:38 +04:00
Alexander Nozdrin
5a361c26cf Update default.conf. 2009-09-23 14:04:08 +04:00
Alexander Nozdrin
b42b46142d Merge from mysql-trunk. 2009-09-23 13:59:23 +04:00
Alexander Nozdrin
5f6299cfe7 Merge from mysql-trunk-alik. 2009-09-23 13:51:45 +04:00
Alexander Nozdrin
60781e320f Update version in configure.in. 2009-09-23 13:50:31 +04:00
Alexander Nozdrin
aaae814e14 Merge from mysql-trunk(-alik). 2009-09-23 11:17:49 +04:00
Alexander Nozdrin
68a9b7dbe3 Merge from mysql-5.1. 2009-09-23 11:16:11 +04:00
Bjorn Munch
60bd6508b6 merge 5.1-mtr -> 5.1 -> trunk 2009-09-23 00:49:34 +02:00
Bjorn Munch
868d45c80f merge from 5.1 of merge from 5.1-mtr 2009-09-22 23:41:37 +02:00
Marc Alff
1ecaf1bc1e Merge mysql-next-mr (revno 2882) --> mysql-trunk-signal 2009-09-22 09:22:22 -06:00
Alexander Nozdrin
9e9b8f32d7 Merge from mysql-next-mr. 2009-09-22 18:26:17 +04:00
Alexander Nozdrin
addd7298bf Merge from mysql-trunk. 2009-09-22 18:24:53 +04:00
Alexander Nozdrin
3b494279bb Merge from mysql-trunk. 2009-09-22 18:23:12 +04:00
Alexander Nozdrin
dcf935a198 Update version. 2009-09-22 18:21:44 +04:00
Bjorn Munch
8ff5366c06 merge from trunk (with trunk-mtr) 2009-09-22 14:39:18 +02:00
Bjorn Munch
3df9e7358e merge from trunk-mtr 2009-09-22 12:52:31 +02:00
unknown
f280974393 Merge from mysql-5.0.86-release 2009-09-21 22:54:39 +02:00
Jonathan Perkin
e465d11383 Merge from mysql-5.1.39-release 2009-09-21 12:10:32 +02:00