thek@kpdesk.mysql.com
218179269f
Bug#26807 "set global event_scheduler=1" and --skip-grant-tables crashes server
...
- Crash occured because Event engine is only initialized if
ACLs are used but not properly marked as disabled.
- The patch is to mark the Event engine as DISABLED if no ACLs
are used to avoid access of uninitialized variables.
2007-03-16 14:57:02 +01:00
tsmith@siva.hindu.god
498756195a
Merge siva.hindu.god:/home/tsmith/m/bk/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-02-08 16:02:58 -07:00
svoj@mysql.com/april.(none)
db8a7b513c
Excluded wrongly merged changeset.
2007-02-07 01:37:21 +04:00
msvensson@neptunus.(none)
e4001b3b5a
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:46:17 +01:00
svoj@june.mysql.com
4a6770e06e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
istruewing@chilla.local
dde4f421f1
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:44:40 +01:00
istruewing@chilla.local
bdf18a85f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:43:38 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
istruewing@chilla.local
77e99fe2ce
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 23:05:46 +01:00
istruewing@chilla.local
177a366e53
After merge fix
2007-02-02 20:19:13 +01:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
istruewing@chilla.local
33e1d1091a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 15:51:25 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00
istruewing@chilla.local
1c34270464
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 10:19:22 +01: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
cmiller@zippy.cornsilk.net
522d6fb0cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:24:28 -05:00
ramil/ram@ramil.myoffice.izhnet.ru
ee56d2be9f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 14:28:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30f904eb2d
Merge mysql.com:/home/ram/work/b19690/b19690.5.0
...
into mysql.com:/home/ram/work/b19690/b19690.5.1
2007-01-31 12:53:36 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
f0f83a36bc
Merge mysql.com:/home/ram/work/b19690/b19690.4.1
...
into mysql.com:/home/ram/work/b19690/b19690.5.0
2007-01-31 10:07:56 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
eb415e4920
fix for bug #19690 : ORDER BY eliminates rows from the result
...
Depending on the queries we use different data processing methods
and can lose some data in case of double (and decimal in 4.1) fields.
The fix consists of two parts:
1. double comparison changed, now double a is equal to double b
if (a-b) is less than 5*0.1^(1 + max(a->decimals, b->decimals)).
For example, if a->decimals==1, b->decimals==2, a==b if (a-b)<0.005
2. if we use a temporary table, store double values there as is
to avoid any data conversion (rounding).
2007-01-31 09:51:05 +04:00
istruewing@chilla.local
42bd03e254
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-29 18:47:46 +01:00
msvensson@pilot.mysql.com
719a8f5896
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943
2007-01-29 14:35:09 +01:00
msvensson@pilot.mysql.com
007d170ad2
Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
...
into pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
2007-01-29 14:33:53 +01:00
msvensson@pilot.mysql.com
7eaa82ea38
Bug#22943 syscall pruning in libmysql
...
- Set the timeout values only where needed
2007-01-29 14:31:48 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
6679490dc6
bug #25890 (mysqltest_embedded crashes on start)
...
binlog_filter and rpl_filter are initialized in server's 'main' function
which doesn't work in the embedded server. So this code moved to
function working in both cases.
2007-01-29 15:26:27 +04:00
monty@narttu.mysql.fi
bb464613ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72
After merge fixes
...
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
2007-01-29 01:47:35 +02:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
gluh@eagle.(none)
67db27537b
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:01 +04: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
sergefp@mysql.com
4908cf0772
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-25 02:28:53 +03:00
sergefp@pylon.mylan
5bc7d596cc
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
...
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
2007-01-24 22:28:28 +03:00
sergefp@mysql.com
e2f0f4dbd3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
2007-01-24 19:13:28 +03:00
tomas@poseidon.mysql.com
f869a0d605
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-01-24 09:13:47 +07:00
mjorgensen@production.mysql.com
2e174533f0
Merge bk-internal:/home/bk/mysql-5.1
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-01-23 20:38:00 +01:00
acurtis/antony@ltamd64.xiphis.org
37f76ab496
Merge xiphis.org:/home/antony/work2/p1-bug25396.4
...
into xiphis.org:/home/antony/work2/p1-bug25396.5
2007-01-23 08:34:50 -08: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
acurtis/antony@xiphis.org/ltamd64.xiphis.org
fddb97da98
Bug#25396
...
"Valgrind leak in closecon_handlerton"
plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
the handlerton struct being freed before the ndb utility thread has destroyed it's THD
but before the plugin has been marked as UNINITIALIZED
Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.
2007-01-23 05:09:14 -08:00
jonas@perch.ndb.mysql.com
6fae8d4133
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 22:25:56 +01:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +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
tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
lars/lthalmann@dl145j.mysql.com
5810ca92c9
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-17 19:32:14 +01:00
kostja@bodhi.local
1480f9f48c
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-17 20:47:50 +03:00
kostja@bodhi.local
15c9d8a6c9
Disable symlinks under valgrind builds (again), with a comment.
2007-01-17 20:46:09 +03:00
kostja@bodhi.local
feb9098a03
Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-17 14:28:10 +03:00
kostja@bodhi.local
175438819a
Fix a ps.test failure in 5.0-runtime tree.
2007-01-17 14:24:54 +03:00