monty@narttu.mysql.fi
693b906f6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e
Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
...
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
2006-11-29 22:51:09 +02:00
baker@bk-internal.mysql.com
098571df33
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-22 05:54:30 +01:00
lars@black.(none)
0791f80865
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-15 13:17:43 +01:00
baker@bk-internal.mysql.com
10dc80259b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-14 19:47:33 +01:00
joerg/mysqldev@mysql.com/production.mysql.com
2ddb61eb93
Raise version number after cloning 5.0.30
2006-11-14 13:37:10 +01:00
bteam/mysqldev@mysql.com/production.mysql.com
d615edba34
configure.in:
...
Raise version number after cloning 5.1.13
2006-11-13 14:50:38 +01:00
baker@bk-internal.mysql.com
52e03bac84
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-11 02:25:40 +01:00
brian@zim.(none)
b46c727a66
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-11-10 17:25:39 -08:00
brian@zim.(none)
739f2c27d0
This patch fixes the example engine, the example parser, and the example daemon to compile. AKA You can now test that the interface is actually working :)
2006-11-10 17:21:59 -08: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.
ee15c11b7c
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
2006-11-07 16:24:35 +03: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
b28b07f09f
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into outpost.site:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-06 00:19:55 +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
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
petr/cps@owlet.local
3df8165cf9
Merge mysql.com:/home/cps/mysql/trees/5.0-runtime-bug9191
...
into mysql.com:/home/cps/mysql/trees/5.1-runtime-bug9191
2006-11-01 18:18:01 +03: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
joerg@trift2.
0d27df6f1a
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01: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)
74d8113c2e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 22:02:33 +02: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)
e8881843a9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 15:46:54 +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
kent@mysql.com/c-794072d5.010-2112-6f72651.cust.bredbandsbolaget.se
8692bb53a3
make_binary_distribution.sh:
...
Split copy of result files to avoid shell limit.
Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
Look for dlopen() even if --with-mysqld-ldflags constains "-static",
as this is not the same as the flag to "ld", it just informs
"libtool" to link static with libraries created part of the build,
even if there exists shared versions.
2006-10-16 02:07:50 +02:00
bteam/mysqldev@mysql.com/production.mysql.com
2af5c98d8f
Raise version number
2006-10-11 12:53:15 +02:00
bteam/mysqldev@mysql.com/production.mysql.com
d74621142b
Raise version number
2006-10-02 15:15:16 +02:00
joerg@trift2.
4525ea4bfb
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-09-22 17:24:06 +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)
f1e91ec7f7
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 17:00:09 +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)
cda04e76f5
Merge shellback.(none):/home/msvensson/mysql/work/my50-work
...
into shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 16:53:21 +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
brian@zim.(none)
3d09079e31
Major changes are plug.in files created for almost all storage engines. A few stray BDB references removed.
2006-08-18 21:19:19 -07:00
brian@zim.(none)
41f920b013
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-14 21:26:33 -07:00
kostja@bodhi.local
04c97488f9
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-08-12 21:06:51 +04:00