Commit graph

34879 commits

Author SHA1 Message Date
igor@olga.mysql.com
5313db2d82 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24035
2007-02-03 10:37:45 -08:00
istruewing@chilla.local
b444566412 After merge fix 2007-02-03 09:26:11 +01:00
igor@olga.mysql.com
215b0a95e1 Fix bug #24035.
This performance degradation for UPDATEs could be observed in the update
statements for which the search key cannot be converted to any valid
value of the type of the search column, like for a  the condition
int_fld=99999999999999999999999999, though it can be guaranteed here
that there is no row with such a key value.
2007-02-02 15:22:10 -08: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
41b6b32ef7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 21:32:58 +01:00
istruewing@chilla.local
972df14cc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53 After merge fix 2007-02-02 20:19:13 +01:00
cmiller@zippy.cornsilk.net
06916f5077 Reverting previous change from 1L -> 1ULL and LL(1) -> 1ULL and
making all to be uniform ULL(1), which is a local definition.
2007-02-02 13:11:44 -05:00
gluh@mysql.com/eagle.(none)
938de5eee4 another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00
gluh@mysql.com/eagle.(none)
9663691aca Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-02 15:21:14 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9 Valgrind errors
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
2007-02-02 15:01:11 +04:00
lzhou/zhl@dev3-63.(none)
8d5ce41010 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb
2007-02-02 09:31:36 +00:00
istruewing@chilla.local
1616e201d8 Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 10:03:22 +01:00
istruewing@chilla.local
3a664472de After merge fix 2007-02-02 10:01:44 +01:00
lzhou/zhl@dev3-63.(none)
fd1135bb19 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb
2007-02-01 16:42:12 +00:00
istruewing@chilla.local
5e5c1b761c Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:33:54 +01:00
istruewing@chilla.local
dae855c168 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:10:09 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
2c45e72e04 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/home/ram/work/b26012/b26012.4.1
2007-02-01 19:56:14 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ac0cab1589 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b26012/b26012.5.0
2007-02-01 19:55:11 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7bcf2bf338 Merge mysql.com:/home/ram/work/b26012/b26012.4.1
into  mysql.com:/home/ram/work/b26012/b26012.5.0
2007-02-01 19:51:45 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d710853fb8 Fix for bug #26012: missed Field_double::size_of()
As we have Field_double::not_fixed we must have Field_double::size_of().
2007-02-01 19:51:02 +04:00
lzhou/zhl@dev3-63.(none)
e208018f75 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
2007-02-01 15:48:23 +00:00
gluh@mysql.com/eagle.(none)
d1185aaeaf Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
2007-02-01 19:12:45 +04:00
istruewing@chilla.local
b0e8f2b534 Bug#25844: "make test" does not find mysql-test-run.pl
Need to change directory before calling mysql-test-run.pl
2007-02-01 15:59:51 +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
mskold/marty@mysql.com/linux.site
0e20ef0ae4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-01 13:59:34 +01:00
gkodinov/kgeorge@rakia.gmz
d9ae9ce58d Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 13:26:25 +02:00
gkodinov/kgeorge@rakia.gmz
95154f86b5 trigger.result:
merge of the 5.0-opt tree
2007-02-01 13:25:50 +02: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
gkodinov/kgeorge@rakia.gmz
f697acb0ca Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 11:07:17 +02:00
gkodinov/kgeorge@rakia.gmz
0d40608fff Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt
2007-02-01 10:50:41 +02:00
mskold/marty@mysql.com/linux.site
c16251ad7c Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment 2007-02-01 09:48:45 +01:00
istruewing@chilla.local
a3705af35f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 09:26:09 +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
istruewing@chilla.local
97cf413d55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 07:52:28 +01:00
igor@olga.mysql.com
710136217b Fixed bug #25407.
The bug could cause choosing a sub-optimal execution plan for 
a single-table query if a unique index with many null keys were 
defined for the table. 
It happened because the code of the check_quick_keys function 
made an assumption that any key may occur in an unique index 
only once. Yet this is not true for keys with nulls that may 
have multiple occurrences in the index.
2007-01-31 19:31:36 -08:00
mskold/marty@mysql.com/linux.site
5cd40ad30b Bug #25522 Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached 2007-01-31 22:38:06 +01:00
cmiller@zippy.cornsilk.net
a795b7097f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
85896c0af5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:23:10 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
cmiller@zippy.cornsilk.net
5a0ac8afe7 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:14:12 -05:00
cmiller@zippy.cornsilk.net
24e3508b0e Bug#25341: "init.d/mysql stop" may timeout too quickly
Thirty five seconds is entirely too short of a period to wait for a server 
to exit.  Instead, make a valliant effort to make sure it exits, and only
give up after a very long period (arbitrarily chosen as 15 minutes).

In addition, if we're being asked to restart the server, then don't try
to start again if trying to stop the server failed.
---
Return zero by default, when the script exits.
---
Set return-/exit-value based on whether we successfully dealt with the 
PID-file.
---
Don't wait that long if the program we're waiting on exits.  It 
should only exit if the server is not going to be started.
2007-01-31 15:39:41 -05:00
mtaylor@qualinost.(none)
50796a040e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-31 15:37:12 -05:00
mtaylor@qualinost.(none)
777c5de911 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-31 15:35:26 -05:00
df@kahlann.erinye.com
9fe01abcca Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-31 18:54:15 +01:00
df@kahlann.erinye.com
beb265b2fe MTR_BUILD_THREAD=auto for test runs during RPM build 2007-01-31 18:18:44 +01:00
joerg@trift2.
f1289aa1d9 Merge trift2.:/MySQL/M50/bug23293-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-31 18:18:11 +01:00
joerg@trift2.
cd16ad87a2 Merge trift2.:/MySQL/M50/bug12676-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-31 18:16:51 +01:00
igor@olga.mysql.com
8760182170 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-31 08:43:42 -08:00