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
dlenev@mockturtle.local
5961d4721f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
2006-11-01 16:20:15 +03:00
dlenev@mockturtle.local
9ac5ed6784
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2006-11-01 15:46:40 +03:00
dlenev@mockturtle.local
bd1b57f930
Small cleanup in code handling stored routines/table prelocking.
...
Use lazy initialization for Query_tables_list::sroutines hash.
This step should significantly decrease amount of memory consumed
by stored routines as we no longer will allocate chunk of memory
required for this HASH for each statement in routine.
2006-11-01 15:41:48 +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
thek@kpdesk.mysql.com
df82f58477
Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-01 09:24:57 +01:00
baker@bk-internal.mysql.com
25409dbd42
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-01 08:46:01 +01:00
brian@zim.(none)
6fcfd4518e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-10-31 23:46:00 -08:00
brian@zim.(none)
31e47a9511
Adding in an ha_end() call. This is the first part of the patch I and Monty have agreed on. In the future engines will have the option of shutting down more quickly via the panic call, or just shutting down during the unloading of a plugin.
2006-10-31 20:10:32 -08:00
msvensson@shellback.(none)
b9d4ccbf18
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
2754edbaf3
Improve the reading of .pid files from var/run
...
- Only read *.pid
- Only allow it to contain a number
2006-10-31 19:02:33 +01:00
msvensson@shellback.(none)
64eb65533e
Make variables static to please Netware compiler
2006-10-31 18:51:23 +01:00
msvensson@shellback.(none)
c6c0dcdc0d
Remove warning, exe_mysql_fix_system_tables are not available on windows
2006-10-31 17:16:07 +01:00
jonas@perch.ndb.mysql.com
543e73d663
Merge perch.ndb.mysql.com:/home/jonas/src/50-multi
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-31 16:15:15 +01:00
jonas@perch.ndb.mysql.com
b5e1d6f2a3
Merge perch.ndb.mysql.com:/home/jonas/src/50-multi
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-31 16:13:01 +01:00
jonas@perch.ndb.mysql.com
c6308d652d
ndb - ndb_multi spurious failure
...
remove timeing dependant part of test
2006-10-31 16:09:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b1e77ed1fd
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
2006-10-31 13:28:44 +04:00
ramil/ram@myoffice.izhnet.ru
1532622b27
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22723/my51-bug22723
2006-10-31 13:19:45 +04:00
ramil/ram@myoffice.izhnet.ru
17828ea652
Merge mysql.com:/usr/home/ram/work/bug22723/my50-bug22723
...
into mysql.com:/usr/home/ram/work/bug22723/my51-bug22723
2006-10-31 13:10:06 +04:00
thek@kpdesk.mysql.com
12d8f2bf31
Bug#22828 _my_b_read() ignores return values for my_seek() calls
...
- Because my_seek actually is capable of returning an error code we should
exploit that in the best possible way.
- There might be kernel errors or other errors we can't predict and capturing
the return value of all system calls gives us better understanding of
possible errors.
2006-10-31 09:26:16 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2d22e2ec84
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
2006-10-31 10:21:18 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
261875bb03
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my50-bug23412
2006-10-31 10:18:48 +04:00
ramil/ram@myoffice.izhnet.ru
ca0087bd07
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my51-bug23412
2006-10-31 09:31:23 +04:00
ramil/ram@myoffice.izhnet.ru
d3d1c6a9b8
Merge mysql.com:/usr/home/ram/work/bug23412/my50-bug23412
...
into mysql.com:/usr/home/ram/work/bug23412/my51-bug23412
2006-10-31 09:15:51 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ed95caceca
Merge mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
...
into mysql.com:/usr/home/ram/work/bug23412/my50-bug23412
2006-10-31 08:53:29 +04:00
kroki/tomash@moonlight.intranet
75881599e5
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
2006-10-30 17:59:23 +03:00
kroki/tomash@moonlight.intranet
77f1d01fbb
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
2006-10-30 17:58:56 +03:00
kroki/tomash@moonlight.intranet
cf99db484e
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21915
2006-10-30 17:57:45 +03:00
kroki/tomash@moonlight.intranet
1c87434699
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21915
2006-10-30 17:51:36 +03:00
kroki/tomash@moonlight.intranet
1bfe00e0da
BUG#21915: Changing limits of table_cache when setting max_connections
...
If the user has specified --max-connections=N or --table-open-cache=M
options to the server, a warning could be given that some values were
recalculated, and table-open-cache could be assigned greater value.
Note that both warning and increase of table-open-cache were totally
harmless.
This patch fixes recalculation code to ensure that table-open-cache will
be never increased automatically and that a warning will be given only if
some values had to be decreased due to operating system limits.
No test case is provided because we neither can't predict nor control
operating system limits for maximal number of open files.
2006-10-30 17:47:02 +03:00
msvensson@shellback.(none)
2fd830c4ea
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-30 15:03:04 +01:00
msvensson@shellback.(none)
9f223873cf
Bug#18654 Test is timing-dependent and fails from scheduling effects (?)
...
- Wait in loop with small sleep until tables has been renamed
2006-10-30 14:42:28 +01:00
msvensson@shellback.(none)
5a049ba807
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-30 13:45:24 +01:00
msvensson@shellback.(none)
e8c7f19179
Improve comments around FLUSH STATUS
...
It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after
2006-10-30 13:35:57 +01:00
msvensson@shellback.(none)
ac54f00f00
Add an extra block to avoid that DBUG_ENTER declare variables after code
2006-10-30 13:08:57 +01:00
msvensson@shellback.(none)
02f56cc185
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-30 10:55:33 +01:00
kostja@bodhi.local
dfc4dd423c
A cleanup.
2006-10-30 12:03:42 +03:00
kostja@bodhi.local
8143148bc1
Cleanup.
2006-10-30 11:36:30 +03:00
kostja@bodhi.local
b94f939c5a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-10-30 10:05:43 +03:00
jonas@perch.ndb.mysql.com
f6fcb302ab
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-28 00:01:24 +02:00
jonas@perch.ndb.mysql.com
b67e5b1131
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-27 23:59:04 +02:00
jonas@perch.ndb.mysql.com
dc2ca8ca10
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:56:51 +02:00
jonas@perch.ndb.mysql.com
f4af143fcb
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:54:57 +02:00
jonas@perch.ndb.mysql.com
85b0e1f80b
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:54:24 +02:00
jonas@perch.ndb.mysql.com
3b726b2845
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-27 16:41:06 +02:00
jonas@perch.ndb.mysql.com
a172a5dc63
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-27 16:38:12 +02:00
jonas@perch.ndb.mysql.com
ebcc594ea3
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-27 16:37:16 +02:00
msvensson@shellback.(none)
f11aa15c4a
Disable abi_check in 5.1 for the moment
2006-10-27 16:36:08 +02:00
jonas@perch.ndb.mysql.com
4037a8d657
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-10-27 16:34:22 +02:00