petr/cps@outpost.site
e06f74f9f9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
2006-11-10 15:05:38 +03:00
msvensson@neptunus.(none)
1717e280e0
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-11-08 11:40:33 +01:00
msvensson@neptunus.(none)
f28c36d079
Bump version to 5.0.30
2006-11-07 18:21:52 +01:00
anozdrin/alik@alik.
7cf65fd309
Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
...
into alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
2006-11-07 13:45:56 +03:00
petr/cps@outpost.site
bfbf1cdee9
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into outpost.site:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-06 00:11:34 +03:00
cmiller@zippy.cornsilk.net
c34f3219b3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-02 17:27:42 -05:00
kent/mysqldev@mysql.com/production.mysql.com
27f3bb1065
configure.in:
...
Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
petr/cps@mysql.com/owlet.local
7974bf90aa
Merge mysql.com:/home/cps/mysql/trees/4.1-runtime-bug9191
...
into mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
2006-11-01 17:35:35 +03:00
petr/cps@mysql.com/owlet.local
3ec542dfbd
Fix Bug #9191 "TIMESTAMP/from_unixtime() no longer accepts 2^31-1"
...
(4.1 version, with post-review fixes)
The fix for another Bug (6439) limited FROM_UNIXTIME() to
TIMESTAMP_MAX_VALUE which is 2145916799 or 2037-12-01 23:59:59 GMT,
however unix timestamp in general is not considered to be limited
by this value. All dates up to power(2,31)-1 are valid.
This patch extends allowed TIMESTAMP range so, that max
TIMESTAMP value is power(2,31)-1. It also corrects
FROM_UNIXTIME() and UNIX_TIMESTAMP() functions, so that
max allowed UNIX_TIMESTAMP() is power(2,31)-1. FROM_UNIXTIME()
is fixed accordingly to allow conversion of dates up to
2038-01-19 03:14:07 UTC. The patch also fixes CONVERT_TZ()
function to allow extended range of dates.
The main problem solved in the patch is possible overflows
of variables, used in broken-time representation to time_t
conversion (required for UNIX_TIMESTAMP).
2006-11-01 16:47:40 +03:00
tsmith/tim@siva.hindu.god
514fd098f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-25 16:28:42 -06:00
tsmith/tim@siva.hindu.god
3af2089b13
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-24 14:42:08 -06:00
msvensson@neptunus.(none)
e0985bef96
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-24 21:05:35 +02:00
msvensson@neptunus.(none)
1a7676fa65
WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
...
BUG#23427 incompatible ABI change in 5.0.26?
- Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
msvensson@neptunus.(none)
e5bf79e608
Replace all refernces to .la libraries with direct references
...
to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag
2006-10-24 13:12:34 +02:00
joerg@trift2.
837746340e
Bump version number to 5.0.29, as 28 will be based directly on 27.
2006-10-24 10:57:17 +02:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5f12986d7d
configure.in:
...
Raised version number to 5.0.28
2006-10-21 01:22:16 +02:00
bteam/mysqldev@mysql.com/production.mysql.com
d74621142b
Raise version number
2006-10-02 15:15:16 +02:00
joerg@trift2.
3acb6778dd
Merge trift2.:/MySQL/M50/extract1-5.0
...
into trift2.:/MySQL/M50/push-5.0
2006-09-21 16:48:31 +02:00
msvensson@shellback.(none)
b178e40cae
Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
fb89352b47
Merge msvensson.mysql.internal:mysql/my50-m-bug16576
...
into shellback.(none):/home/msvensson/mysql/work/my50-work
2006-09-15 16:52:08 +02:00
joerg@trift-lap.fambruehe
a33fdb44e5
Include "manual.chm" in the source distribution, because we now use it for Windows builds unchanged.
2006-09-14 16:34:35 +02:00
msvensson@shellback.(none)
df2fbc784d
Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c
...
- Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away.
2006-09-12 15:47:48 +02:00
joerg@trift2.
b6071f06ce
configure.in : NDB version and general version must be (kept) in sync - do that.
2006-09-07 17:51:28 +02:00
joerg@trift2.
d7b47f4dfd
Merge trift2.:/M50/clone-5.0
...
into trift2.:/M50/push-5.0
2006-09-07 17:47:57 +02:00
joerg@trift2.
1fc7b01507
Fix a change to "configure.in" that broke building commercial sources.
...
To be pushed to both the cloned 5.0.25 and the general 5.0 tree.
2006-09-07 17:37:51 +02:00
bteam/mysqldev@mysql.com/production.mysql.com
bd7fefcb78
Raise version number
2006-09-06 17:56:59 +02:00
georg@lmy002.wdf.sap.corp
367c2d5ebc
Modification for win subdirectory
2006-09-01 16:04:59 +02:00
msvensson@neptunus.(none)
b25b49a05a
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060612110740|13873
2006-08-24 11:39:52 +02:00
msvensson@neptunus.(none)
31be565d2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
4a461fdae3
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2006-07-29 17:40:10 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
5d948f5ec4
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-29 17:26:06 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f2ec5d7128
configure.in:
...
Corrected typo
2006-07-29 17:24:48 +02:00
kroki/tomash@moonlight.intranet
5c90b6f810
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2faea98324
Makefile.am, configure.in:
...
Man page for mysqld command move to section 8 (bug#21220)
2006-07-28 23:12:40 +02:00
msvensson@neptunus.(none)
731d346f14
Bug#16576 Patch to compile on GNU/Hurd (ps check in configure)
...
- Thanks to Christian Hammers for the patch
2006-07-26 16:00:11 +02:00
msvensson@maint1.mysql.com
f1ef4af700
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517
...
into maint1.mysql.com:/data/localhome/msvensson/my50-bug19517
2006-07-20 14:11:37 +02:00
joerg@trift2.
5620f8e0a6
Increment the version number to 4.1.22, as 4.1.21 is cloned.
2006-07-14 17:55:34 +02:00
cmiller@zippy.(none)
2c5308a703
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-13 11:11:20 -04:00
cmiller@zippy.(none)
4980c64a5b
Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470
...
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
2006-07-12 11:39:12 -04:00
cmiller@calliope.local
834111811b
Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops
...
The bug is thqt we use some nonstandard assembly codes in our strings
source, and some assemblers don't know what to do with them: Specifically,
Sun's Solaris assembler and Apple's Darwin assembler balk at them.
This patch, rather than trying to test for properties of the assembler,
which Autoconf doesn't have any decent facilites for, instead tries to
compile the code in question and disables assembly if it fails.
There's still the problem of unportable assembly, but I'll leave that
to someone who feels like rewriting and debugging it.
2006-07-12 10:26:19 -04:00
joerg@trift2.
6b9e4ff960
Raise the version number.
2006-07-11 12:34:43 +02:00
cmiller@zippy.(none)
8ea01fbca8
Add a more reliable "getconf" test for Linuxthreads. The later trees should already
...
have a better test (and so this should be null-merged there).
ALSO! Make it so that it accepts NPTL as a valid _equivalent_ implementation.
2006-07-07 16:47:57 -04:00
elliot@mysql.com
68db32613b
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0
2006-06-30 00:14:25 -04:00
joerg@mysql.com
1054e8f66e
Increment the version number.
2006-06-29 16:38:14 +02:00
acurtis@xiphis.org
f242546e85
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
...
into xiphis.org:/home/antony/work2/p4-bug12096.2-merge
2006-06-28 09:54:40 -07:00
iggy@mysql.com
578fee6990
Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter
2006-06-27 18:07:23 -04:00
kent@mysql.com
392bb51f25
configure.in, net_serv.cc, compile-netware-END:
...
Changes for Netware
2006-06-17 00:30:02 +02:00
msvensson@neptunus.(none)
4ca95f911a
Bug#19517 No simple way to detect wether server was compiled with libdbug
...
- Define DBUG_ON and DBUG_OFF in config.h
2006-06-12 13:07:40 +02:00
acurtis@xiphis.org
23e612ae11
Bug#12096
...
"Add line for non-executable stack in .s files"
Fix so that configure will use "--noexecstack" for assembler if gcc supports
option and compiled C doesn't need executable stack.
2006-05-31 00:07:58 -07:00
kent@mysql.com
7ffc786686
configure.in:
...
Update NDB version as well
2006-05-24 12:30:34 +02:00
kent@mysql.com
22a52ede3f
configure.in:
...
Stepped up to 5.0.23
2006-05-24 12:28:34 +02:00
kent@mysql.com
eb627531f3
configure.in:
...
Stepped up to 4.1.22
2006-05-24 12:20:17 +02:00
kent@mysql.com
39516f3886
configure.in:
...
Stepped up to 4.0.28
2006-05-11 19:48:57 +02:00
kent@mysql.com
a14f1250d6
configure.in:
...
Changed version to 4.1.20
2006-04-29 07:32:12 +02:00
msvensson@shellback.(none)
e5004d1312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-27 17:35:29 +02:00
kent@mysql.com
dd2165f6b9
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-27 11:38:48 +02:00
msvensson@neptunus.(none)
2c3a3bd87f
Remove hacks for building shared libs on aix and qnx
2006-04-26 12:16:57 +02:00
bpontz@mysql.com
92825f3ada
configure.in:
...
clone-off for 5.0.21
2006-04-26 08:26:33 +02:00
msvensson@shellback.(none)
56f1424c1a
Fix for building shared libraries on AIX with 64-bit mode
...
Set building of shared libraries on QNX to defatul OFF
2006-04-22 21:53:33 +02:00
msvensson@neptunus.(none)
8786a1258f
Merge neptunus.(none):/home/msvensson/mysql/my50-bug18837
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-21 09:47:21 +02:00
kent@mysql.com
543960f2fb
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-04-19 15:41:56 +02:00
bell@sanja.is.com.ua
cb81389aef
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-04-13 15:07:50 +03:00
msvensson@neptunus.(none)
f3373899e2
Bug#18837 Many build and test failures when configuring without --disable-shared
...
Build "NOINST" tools with -static flag to avoid any ld problems when using them
2006-04-13 13:02:58 +02:00
bell@sanja.is.com.ua
b4980d4383
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-04-11 14:49:33 +03:00
bell@sanja.is.com.ua
5fe95af804
Avoid trying to include <asm/atomic.h> when it doesn't work in C++
...
code. (Bug #13621 )
2006-04-10 21:57:29 +03:00
kent@mysql.com
2d8f8ac6e1
configure.in:
...
Check for crypt() in libc first (bug#16478)
2006-04-06 00:43:58 +02:00
bpontz@mysql.com
c1ac02a424
configure.in:
...
Increased version number because of clone-off
2006-03-29 22:20:16 +02:00
msvensson@neptunus.(none)
0811648e31
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-20 21:35:05 +01:00
msvensson@neptunus.(none)
8ca012aefb
Don't look for "dlopen" if server linked with -static or -all-static flag. Update after review
2006-03-20 19:55:38 +01:00
msvensson@neptunus.(none)
7bb3f398e0
Merge neptunus.(none):/home/msvensson/mysql/bug11835/my41-bug11835
...
into neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
2006-03-10 10:15:50 +01:00
msvensson@neptunus.(none)
6d4aa0e215
Bug#11835 CREATE FUNCTION crashes server
...
- Don't look for 'dl_open' if mysqld is compiled with "-all-static"
2006-03-10 09:51:08 +01:00
brian@zim.(none)
78abb2d117
Porting fix that allows others to include compiled code with different parsers.
...
Makes you wonder what I am up to, doesn't?
2006-03-09 10:09:52 -08:00
bpontz@mysql.com
7410560baf
configure.in:
...
cloned
2006-03-02 12:24:07 +01:00
monty@mysql.com
54274976e7
Fixed compiler warnings from gcc 4.0.2:
...
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
2006-02-25 17:46:30 +02:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
kent@mysql.com
1318e790bc
configure.in:
...
Cloned off 4.1.18, new release number 4.1.19
2006-01-27 12:10:40 +01:00
kent@mysql.com
4ad32690af
configure.in:
...
Generated "libmysql.ver" will be in \$(top_builddir)
2006-01-27 01:38:05 +01:00
konstantin@mysql.com
d2bba04183
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 15:15:09 +03:00
svoj@april.(none)
70bb06685b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG3074/mysql-4.1
2006-01-18 00:02:25 +04:00
svoj@april.(none)
f84b301bd1
BUG#3074: Unversioned symbols in shared library
...
libmysqlclient versioning when linked with GNU ld.
2006-01-17 18:51:08 +04:00
joerg@mysql.com
e2b3b1f398
Increase the version number to 4.1.18
2006-01-17 12:55:30 +01:00
joerg@mysql.com
4e37b62ff9
Increment the version number to 5.0.19
2005-12-21 18:50:06 +01:00
ingo@mysql.com
97e3b90f65
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-14 10:40:49 +01:00
jonas@perch.ndb.mysql.com
eae7c39a5c
Update ndb version in configure.in
2005-12-13 12:12:41 +01:00
ingo@mysql.com
270cad2f63
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug10932
2005-12-07 19:47:55 +01:00
knielsen@mysql.com
e7d218d2e9
Bump version number following 5.0.17 release clone-off
2005-12-07 12:43:32 +01:00
ingo@mysql.com
6b18dbef31
Bug#10932 - Building server with key limit of 128, makes test cases fail
...
Allow for configuration of the maximum number of indexes per table.
Added and used a configure.in macro.
Replaced fixed limits by the configurable limit.
Limited MyISAM indexes to its hard limit.
Fixed a bug in opt_range.cc for many indexes with InnoDB.
Tested for 2, 63, 64, 65, 127, 128, 129, 255, 256, and 257 indexes.
Testing this part of the bugfix requires rebuilding of the server
with different options. This cannot be done with our test suite.
Therefore I added the necessary test files to the bug report.
If you repeat the tests, please note that the ps_* tests fail for
everything but 64 indexes. This is because of differences in the
meta data, namely field lengths for index names etc.
2005-12-02 16:27:18 +01:00
joerg@mysql.com
1a8ac44cff
Raise the version number (as 4.1.16 has been cloned).
2005-11-30 21:50:09 +01:00
kent@mysql.com
58fc48046c
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 13:17:20 +01:00
kent@mysql.com
133c00beb4
configure.in:
...
Corrected "include/readline" link for "make distcheck"
2005-11-19 12:58:22 +01:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-19 11:11:09 +01:00
jimw@mysql.com
f8ce7bc01e
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-17 13:37:30 -08:00
jimw@mysql.com
c1261f588f
Merge mysql.com:/home/jimw/my/mysql-4.1-12640
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-17 10:59:21 -08:00
joerg@mysql.com
1aa66c59c0
Raise the version number to 5.0.17.
2005-11-09 14:12:44 +01:00
kent@mysql.com
b269caecb1
Additional "make distcheck" changes specific to 5.0
2005-11-09 11:56:04 +02:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
msvensson@neptunus.(none)
10163332a7
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13957/my50-bug13957
2005-11-03 11:01:13 +01:00