msvensson@neptunus.(none)
939f18a676
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:31:27 +02:00
msvensson@neptunus.(none)
939b32f564
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 11:31:14 +02:00
msvensson@neptunus.(none)
ed39121c9a
After review fixes
2005-05-09 11:30:20 +02:00
msvensson@neptunus.(none)
34cec09efb
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
670eef8756
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 11:23:12 +02:00
ramil@mysql.com
def8eb631c
Merge mysql.com:/home/ram/work/mysql-4.1
...
into mysql.com:/home/ram/work/mysql-5.0
2005-05-06 20:11:01 +05:00
ramil@ram-book.(none)
e1b6b7fe36
A fix (bug #7970 : CONFIG_NR_CPUS not defined for kernel header percpu.h).
2005-05-06 16:12:42 +05:00
msvensson@neptunus.(none)
5b5565c30a
BUG#10241 cygwin port: invalid pragma interface directives
...
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
2005-05-04 15:05:56 +02:00
serg@serg.mylan
530b6ba541
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
serg@serg.mylan
9c332d8d2a
yassl changeset 2:
...
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
don't set -DUSE_MYSYS_NEW for gcc 2.95
set $USE_MYSYS_NEW even if CXX is g++
yassl bugfixes
instantiate all yassl templates explicitly
2005-04-30 19:48:45 +02:00
monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00
joerg@mysql.com
74fdb2663c
Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).
2005-04-26 13:15:20 +02:00
joerg@mysql.com
1523119091
Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
2005-04-26 12:16:12 +02:00
joerg@mysql.com
49ac2dac3e
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
...
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
joerg@mysql.com
eaa79cb452
Step 2 of the switch to support configuration with NPTL:
...
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
When we support configuration with NPTL but no Linuxthreads, this misuse must cease.
2005-04-20 20:38:57 +02:00
serg@serg.mylan
54fc6fbfe8
set _XOPEN_SOURCE differently depending on __STDC_VERSION__
...
[sigh]
2005-03-18 14:59:07 +01:00
serg@serg.mylan
ed9c9732c9
sun forte does not define __sun__, only __sun and sun (gcc defines all the three)
2005-03-15 18:45:29 +01:00
serg@serg.mylan
10c06f257a
include/my_global.h
...
define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
remove a cast
2005-03-15 18:31:56 +01:00
ingo@mysql.com
212388bd3c
Merge with after merge fix
2005-03-04 11:37:45 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
mysqldev@mysql.com
a4a34a87c8
corrected automerge error
2005-02-03 17:00:51 +01:00
tulin@mysql.com
653c6fa1ad
backported configure flag from 5.0
...
workaround for HPUX signal.h error, missing extern "C"
moved my_thread_end to NdbThreadExit
more checks for shared memory transporter signum setup
2005-02-02 10:50:33 +01:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
ingo@mysql.com
48488e483a
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01:00
ram@gw.mysql.r18.ru
7f6fca4cf0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-26 17:09:38 +04:00
jimw@mysql.com
d11081bd6f
Merge
2005-01-24 13:48:48 -08:00
kent@mysql.com
878e99e65d
my_global.h:
...
Bug#7145 Added cast to doublestore() and ARM
2005-01-24 17:10:03 +01:00
ram@gw.mysql.r18.ru
1791e10824
Stick FN_REFLEN to PATH_MAX.
2005-01-24 13:04:52 +04:00
konstantin@mysql.com
3afd1939f7
Portability fix in libmysql (FreeBSD)
2004-12-16 12:43:02 +03:00
guilhem@mysql.com
e38dae0bc1
Merge
2004-11-16 00:04:12 +01:00
tomas@poseidon.ndb.mysql.com
16e34bd27d
changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
...
added libs variable for ndbmgmclient used by mysqladmin
add linkage with @ndb_mgmclient_libs@
additional options for ndbcluster
added support for managing the cluster to mysqladmin
added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
2004-11-15 12:40:32 +00:00
brian@avenger.(none)
f05daf02ba
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
2004-11-11 18:58:57 -08:00
monty@mysql.com
d45bbae2de
Fix for valgrind/purify for variables that the compiler touches but that doesn't affect the outcome of the tests
2004-11-09 14:46:26 +02:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
konstantin@mysql.com
105a2c1c03
Fix for Bug#6024 "Test "client_test" fails in 4.1.6-gamma build (1)":
...
let's not assume that char is signed (its signedness is not defined).
The server was also affected by the wrong typedef.
2004-10-15 03:54:40 +04:00
monty@mysql.com
62f3cd6a31
Merge with 4.0 for 4.1 release
...
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
vva@eagle.mysql.r18.ru
91e8afac37
patch fixing after review on patch-fixing of
...
Bug #5492
"set @@session.read_rnd_buffer_size=33554432" crashes server on query
1. added warning comments for uint3korr (need one more byte allocated)
2. unsigned long in uint3korr was replaced by unsigned int to
avoid problems on 64-bits platforms
3. shorten warning comments in init_rr_cache in sql/records.cc
2004-10-04 23:26:42 +05:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
serg@serg.mylan
62722e7b05
merged
2004-08-20 00:52:43 +02:00
ingo@mysql.com
ad7f0fa51e
Build bug on 64-Bit platforms.
...
Removed improper casts.
Thanks to Joerg Bruehe for the fix.
2004-08-19 21:41:10 +02:00
serg@serg.mylan
e1237cbc53
manually merged
2004-08-18 19:57:55 +02:00
serg@serg.mylan
6023b58b9f
Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow
2004-08-11 23:43:41 +02:00
serg@serg.mylan
8d080cbcfa
manual merge
2004-07-20 15:34:57 +02:00
serg@serg.mylan
141d43ef95
forced X/Open mode on HPUX removed. The correct way (that affects not only C but also C++ and linking) would be
...
CFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
CXXFLAGS="-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_HPUX_SOURCE"
LDFLAGS="-lxnet"
but apparently MySQL works without too.
2004-07-13 09:37:16 +02:00
monty@mysql.com
31fe2837f9
Merge with 4.1
2004-07-12 08:20:24 +03:00
konstantin@mysql.com
664329b565
my_global.h:
...
Define cxa_pure_virtual to print error message and DBUG_ASSERT:
calls to pure virtual methods should not go unnoticed.
2004-07-09 01:35:35 +04:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00