kent@kent-amd64.(none)
36c5e5308a
Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build
...
into mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
2007-11-30 01:37:07 +01:00
kent@mysql.com/kent-amd64.(none)
666ec84bca
my_global.h:
...
Added 64 bit Mac OS X hard coded settings, for universal binaries
2007-11-30 01:36:05 +01:00
kent@mysql.com/kent-amd64.(none)
611b737af3
Excluded verbose and bad change to Mac OS X universal binaries handling
2007-11-30 01:22:15 +01:00
kent@kent-amd64.(none)
c0b8aa419b
Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build
...
into mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
2007-11-29 23:44:16 +01:00
kent@mysql.com/kent-amd64.(none)
369d75dc75
my_global.h:
...
Added 64 bit Mac OS X hard coded settings, for universal binaries
2007-11-29 23:42:04 +01:00
kaa@polly.(none)
56e85a8cb2
Fix for bug #31254 : "Max_data_length" truncated / reported wrong
...
(compiler issue ?)
Problem:
Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.
Solution:
Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.
Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.
2007-10-12 14:03:51 +04:00
kaa@polly.(none)
d8d3698b4a
Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_size
...
into polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 11:18:00 +04:00
kaa@polly.(none)
8da409ac16
This patch is a part of work on bug #5731 "key_buffer_size not properly restricted to 4GB".
...
The patch limits read_buffer_size and read_rnd_buffer_size by 2 GB on all platforms for the following reasons:
- I/O code in mysys, code in mf_iocache.c and in some storage engines do not currently work with sizes > 2 GB for those buffers
- even if the above had been fixed, Windows POSIX read() and write() calls are not 2GB-safe, so setting those buffer to sizes > 2GB would not work correctly on 64-bit Windows.
2007-09-07 11:58:04 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
d82d6c08fd
Merge mysql.com:/home/ram/work/b29079/b29079.4.1
...
into mysql.com:/home/ram/work/b29079/b29079.5.0
2007-06-23 08:56:53 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
aabbd2fb69
Fix for bug #29079 : Semantics of "bigint" depend on platform specifics (size, signedness of char ?)
...
Problem: long and long long types mess in a comparison may lead to wrong results on some platforms.
Fix: prefer [unsigned] long long as [u]longlong as it's used unconditionally in many places.
2007-06-22 17:12:40 +05:00
msvensson@pilot.blaudden
47d3829f0b
Fix for bug #28240 : "isinf()" cannot be used in C++ for lack of prototype
...
- Since isinf() portability across various platforms and
compilers is a complicated question, we should not use
it directly. Instead, the my_isinf() macro should be used,
which is defined as an alias to the system-defined isinf()
if it is safe to use, or a workaround implementation otherwise
2007-05-16 10:10:02 +02:00
kaa@polly.local
3bed463963
If isinf() is not available on a target platform, use our own imlementation via finite() and isnan(). If either of the last two is not available as well, use simple replacements which are platform-neutral, but slower than compiler intrinsics.
2007-04-29 16:57:17 +04:00
msvensson@pilot.blaudden
9bd17ef189
Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 13:59:44 +02:00
msvensson@pilot.blaudden
f028e17ab7
Merge pilot.blaudden:/home/msvensson/mysql/bug14862/my50-bug14862
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 11:16:56 +02:00
msvensson@pilot.blaudden
dd0d2146c3
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-18 13:22:32 +02:00
msvensson@pilot.blaudden
20e622dcf3
Bug#25452 mysql_upgrade access denied
...
- Improve mysql_upgrade and add comments describing it's logic
- Don't look for mysql and mysqlcheck randomly, use dir where mysql_upgrade
was started from
- Don't look for mysql_fix_privilege_tables.sql randomly, compile
in the mysql_fix_privilege_tables.sql file and use that to upgrade
the system tables of MySQL
- Check for any unexpected error returned from runnning the mysql_fix_privilege_tables SQL
- Fix bug#26639, bug#24248 and bug#25405
2007-04-18 13:21:39 +02:00
msvensson@pilot.blaudden
c405f94cfb
Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
...
- Rely only on HAVE_ISINF to determine if 'isinf' can be used.
2007-04-12 10:29:22 +02:00
msvensson@pilot.blaudden
7563ebefca
Bug#25118 ATTRIBUTE_FORMAT_FPTR undeclared in m_ctype.h
...
- Move marcos for __attribute__ usage to my_attribute.h and
include that file where needed
2007-04-12 00:43:25 +02:00
anozdrin/alik@booka.opbmk
c666e2f276
Polishing: use constants instead of magic numbers.
2007-03-09 08:05:08 +03:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33
Fixed compiler warnings (for linux and win32 and win64)
...
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
222e128b34
Fixed unsafe define of uint4korr()
...
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
2007-02-21 13:02:57 +02:00
istruewing@chilla.local
73e61944f7
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-25 20:10:31 +02:00
monty@mysql.com/narttu.mysql.fi
120e3f5ee1
Avoid compiler warnings on powermacg5
...
Fixed compilation error when trying to compile libmysqld on powermac
2007-01-23 16:42:03 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
f6e70c1453
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2007-01-22 03:33:59 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff58749b29
Fix for configure to detect library correctly.
...
Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".
2007-01-22 02:32:07 +02:00
cmiller@zippy.cornsilk.net
896e2623eb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05:00
mmj@tiger.mmj.dk
f61a873c60
my_global.h:
...
Patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 23:18:04 +01:00
mmj@tiger.mmj.dk
37ae5bbbbe
my_global.h:
...
Add patch from Alfredo for TARGET_FAT_BINARY
2007-01-04 22:22:25 +01:00
tsmith/tim@siva.hindu.god
682596d7ce
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
msvensson@shellback.
c41e307d85
BUG#24687 func_misc test fails on win64
...
- Use same precision (milliseconds) for all time functions
used when calculating time for pthread_cond_timedwait
- Use 'GetSystemTimeAsFileTime' for both start and curr time
2006-12-14 15:23:44 +01:00
monty@mysql.com/narttu.mysql.fi
3d40956039
Fixed portability issue in my_thr_init.c (was added in my last push)
...
Fixed compiler warnings (detected by VC++):
- Removed not used variables
- Added casts
- Fixed wrong assignments to bool
- Fixed wrong calls with bool arguments
- Added missing argument to store(longlong), which caused wrong store method to be called.
2006-11-30 18:25:05 +02:00
msvensson@shellback.(none)
5126dcc878
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-03 01:04:18 +02:00
msvensson@shellback.(none)
b975b4a793
Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers
...
This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro
2006-10-03 00:48:26 +02:00
msvensson@neptunus.(none)
14186cbdca
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-02 18:46:41 +02:00
msvensson@neptunus.(none)
cb0a874c11
When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax
...
- disable __attribute__ when using qcc
2006-10-02 13:53:10 +02:00
msvensson@neptunus.(none)
1517d37048
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)
2006-10-02 13:46:40 +02:00
tsmith/tim@siva.hindu.god
5ffa3e1bff
Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol)
2006-09-30 02:00:04 -06:00
jimw@rama.(none)
0296227343
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-29 19:28:44 -07:00
jimw@rama.(none)
52d22ad827
Disable __attribute__ entirely on g++ < 3.4. (Bug #2717 )
2006-09-29 19:28:16 -07:00
jimw@rama.(none)
68eadc8a79
Merge rama.(none):/home/jimw/my/mysql-4.1-clean
...
into rama.(none):/home/jimw/my/mysql-5.0-clean
2006-09-28 18:09:10 -07:00
jimw@rama.(none)
cb6a084076
Bug #2717 : include/my_global.h mis-defines __attribute__
...
Fix when __attribute__() is stubbed out, add ATTRIBUTE_FORMAT() for specifying
__attribute__((format(...))) safely, make more use of the format attribute,
and fix some of the warnings that this turns up (plus a bonus unrelated one).
2006-08-17 12:25:40 -07:00
monty@mysql.com/narttu.mysql.fi
7d0b042ec5
Better bug fix for #14400 "Query joins wrong rows from table which is subject of "concurrent insert""
...
The previous bug fix didn't work when using partial keys.
Don't use GNUC min/max operations are they are depricated.
Fixed valgrind warning
2006-08-10 22:41:19 +03:00
msvensson@neptunus.(none)
6dfeb33123
Bug#21222 Patch to support GNU/kFreeBSD build
...
- Thanks to Christian Hammers for the patch!
2006-07-26 15:43:03 +02:00
monty@mysql.com
d76830faa5
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 02:35:52 +03:00
monty@mysql.com
8e2099295d
Fixed include file usage
...
hp_test2 now works again
Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694 )
2006-06-30 02:25:35 +03:00
svoj@may.pils.ru
8d802218fb
Merge april:devel/BitKeeper/mysql-5.0-engines
...
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0
2006-06-19 16:11:23 +05:00
svoj@may.pils.ru
097b3bbfa9
Fixed windows compilation failure introduced by fix for BUG#12982.
2006-06-15 13:38:32 +05:00
svoj@may.pils.ru
036f947be7
BUG#12982 - LOAD DATA fails without any error for big files with big
...
read buffer
Setting read buffer to values greater than SSIZE_MAX results in
unexpected behavior.
According to read(2) manual:
If count is greater than SSIZE_MAX, the result is unspecified.
Set upper limit for read_buffer_size and read_rnd_buffer_size to
SSIZE_MAX.
2006-06-07 19:44:43 +05:00