kaa@polly.(none)
84659e2de1
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-04 13:38:58 +04:00
pekka@sama.ndb.mysql.com
82da7623d4
ndb - bug#29390: if ScanFilter is too large, abort or optionally discard it
2007-10-04 11:32:49 +02:00
kaa@polly.(none)
bd885daa4f
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-04 13:29:37 +04:00
aelkin/elkin@koti.dsl.inet.fi
4c6e14ce8d
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge
2007-10-04 12:27:14 +03:00
gluh@eagle.(none)
53fa81ac03
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-04 14:23:55 +05:00
kaa@polly.(none)
8f204ea029
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-04 13:07:11 +04:00
mhansson@dl145s.mysql.com
c10447053c
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/bug30942/my50-bug30942
2007-10-04 11:06:01 +02:00
kaa@polly.(none)
1ba3f4f56b
Issue a warning if a user sets an option or a variable to a value that is greater than a defined maximum for the option/variable.
...
This is for bug #29446 "Specifying a myisam_sort_buffer > 4GB on 64 bit machines not possible". Support for myisam_sort_buffer_size > 4 GB on 64-bit Windows will be looked at later in 5.2.
2007-10-04 12:34:00 +04:00
mhansson/martin@linux-st28.site
ec959efa71
Merge linux-st28.site:/home/martin/mysql/src/bug30942/my50-bug30942
...
into linux-st28.site:/home/martin/mysql/src/bug30942/my51-bug30942
2007-10-04 10:06:33 +02:00
mhansson/martin@linux-st28.site
028992ac69
Bug #30942 : select str_to_date from derived table returns varying results
...
The function str_to_date has a field to say whether it's invoked constant
arguments. But this member was not initialized, causing the function to
think that it could use a cache of the format type when said cache was in
fact not initialized.
Fixed by initializing the field to false.
2007-10-04 09:15:26 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
16db036d82
Bug #31155 gis types in union'd select cause crash.
...
We use get_geometry_type() call to decide the exact type
of a geometry field to be created (POINT, POLYGON etc)
Though this function was only implemented for few items.
In the bug's case we need to call this function for the
Item_sum instance, where it was not implemented, what is
the reason of the crash.
Fixed by implementing virtual Item::get_geometry_type(),
so it can be called for any Item.
2007-10-04 12:01:28 +05:00
aelkin/elkin@koti.dsl.inet.fi
d155f65a96
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug26000_show_slave_status_when_no_active_mi
2007-10-03 15:12:53 +03:00
aelkin/elkin@koti.dsl.inet.fi
9461b6113b
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug26000_show_slave_status_when_no_active_mi
2007-10-03 13:43:56 +03:00
sven@murkla.(none)
5daff6547e
BUG#30752 rpl_dual_pos_advance valgrind (jump depends on uninitialized LOG_INFO)
...
Problem: one thread could read uninitialized memory from (the stack of) another
thread.
Fix: swapped order of initializing the memory and making it available to the
other thread.
Fix: put lock around the statement that makes the memory available to the other
thread.
Fix: all fields of the struct are now initialized in the constructor, to avoid
future problems.
2007-10-03 11:57:14 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
a7a6c6eb08
Bug #30955 geomfromtext() crasher.
...
end-of-line check missed in Gis_read_stream::get_next_word,
what can lead to crashes (expecially with NULL strings).
End-of-line check added
2007-10-03 13:35:35 +05:00
mskold/marty@mysql.com/linux.site
c91d8068d1
Bug#25817 UPDATE IGNORE doesn't check write_set when checking unique indexes: Post merge 5.0->5.1
2007-10-03 09:54:33 +02:00
mskold/marty@mysql.com/linux.site
94e7bf9f4b
Removed tabs
2007-10-03 09:29:10 +02:00
tsmith@sita.local
0111438b45
Bug #20358 : InnoDB hang on the adaptive hash index latch in btr0sea.c
...
Add --skip-innodb-adaptive-hash-index option, which is a way to
work around the bug (by disabling the adaptive hash feature entirely).
This may be useful even once the bug is fixed, for benchmarking purposes.
There are some workloads for which the adaptive hash index is not effective.
2007-10-02 23:47:30 -06:00
gkodinov/kgeorge@magare.gmz
c6e974226e
fixed a warning in the fix for bug 28702
2007-10-02 17:45:49 +03:00
gkodinov/kgeorge@magare.gmz
6a03980418
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28702-vg-5.0-opt
2007-10-02 15:36:08 +03:00
gkodinov/kgeorge@magare.gmz
6c8627de49
Fixed a valgrind warning with the fix for bug 28702.
2007-10-02 15:36:07 +03:00
mhansson@dl145s.mysql.com
6e43d599a8
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/bug30832/my50-bug30832
2007-10-02 14:36:07 +02:00
evgen@moonbone.local
a903032574
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/31095-bug-5.0-opt-mysql
2007-10-02 12:36:06 +00:00
mskold/marty@linux.site
a26772ca21
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-10-02 14:23:59 +02:00
mskold/marty@mysql.com/linux.site
403f0afc29
Bug#25817 UPDATE IGNORE doesn't check write_set when checking unique indexes: Added checks
2007-10-02 13:36:13 +02:00
bar@bar.myoffice.izhnet.ru
b96cc51ff6
Merge mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
2007-10-02 15:41:43 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
5e14f4f038
Bug#29675 collation_connection is defined twice for the same value
...
Removing redundant initialization.
2007-10-02 15:20:45 +05:00
kaa@polly.(none)
467a299840
Merge polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-02 13:39:00 +04:00
tomas@whalegate.ndb.mysql.com
132dba0020
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-10-02 11:38:14 +02:00
kaa@polly.(none)
80a2d47b22
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-02 13:34:33 +04:00
kaa@polly.(none)
b794e5f212
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731_buffer_limits
...
into polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 12:41:08 +04:00
kaa@polly.(none)
7c58ed48d0
Merge polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
...
into polly.(none):/home/kaa/src/maint/bug5731/my51-bug5731
2007-10-02 11:32:33 +04:00
kaa@polly.(none)
d8d3698b4a
Merge polly.(none):/home/kaa/src/maint/bug5731.old/my50-bug5731-read_buffer_size
...
into polly.(none):/home/kaa/src/maint/bug5731/my50-bug5731
2007-10-02 11:18:00 +04:00
evgen@moonbone.local
49af76ac8a
Bug#31095: Unexpected NULL constant caused server crash.
...
The Item_func_rollup_const class is used for wrapping constants to avoid
wrong result for ROLLUP queries with DISTINCT and a constant in the select
list. This class is also used to wrap up a NULL constant but its null_value
wasn't set accordingly. This led to a server crash.
Now the null_value of an object of the Item_func_rollup_const class is set
by its fix_length_and_dec member function.
2007-10-01 20:03:50 +00:00
mhansson@dl145s.mysql.com
96e68cfbb5
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into dl145s.mysql.com:/data0/mhansson/bug30832/my51-bug30832
2007-10-01 19:05:23 +02:00
dkatz@damien-katzs-computer.local
07f616d6c0
Merge damien-katzs-computer.local:/Users/dkatz/bug29772/my50-bug29772
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
2007-10-01 12:41:38 -04:00
dkatz@damien-katzs-computer.local
cd570cb9e0
Merge damien-katzs-computer.local:/Users/dkatz/bug29589/my50-bug29589
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
2007-10-01 12:37:43 -04:00
dkatz@damien-katzs-computer.local
2034df1553
Merge damien-katzs-computer.local:/Users/dkatz/bug29772/my50-bug29772
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
2007-10-01 12:33:59 -04:00
dkatz@damien-katzs-computer.local
7328999fd7
Merge damien-katzs-computer.local:/Users/dkatz/bug29589/my50-bug29589
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
2007-10-01 12:32:17 -04:00
monty@narttu.mysql.fi
5dcb64882d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-10-01 15:33:21 +03:00
monty@mysql.com/narttu.mysql.fi
315acca125
Removed extra spaces
...
Added extra debug
2007-10-01 15:32:07 +03:00
anozdrin/alik@station.
7f554deb95
BUG#30472: libmysql doesn't reset charset, insert_id after
...
succ. mysql_change_user() call.
Use 2 bytes for character set number.
2007-10-01 15:41:18 +04:00
thek@adventure.(none)
c206f3b97e
Bug #30768 query cache patch for bug #21074 crashes on windows
...
"pthread_mutex_trylock" isn't implemented correctly for the Windows platform.
This temporary patch reverts the patch for bug#21074 for Windows until
pthread_mutex_trylock is properly implemented.
2007-10-01 12:44:29 +02:00
gkodinov/kgeorge@magare.gmz
61085ae612
merge 5.0-opt -> 5.1-opt
2007-10-01 12:56:25 +03:00
lars/lthalmann@dl145h.mysql.com
b6553689fd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-10-01 11:25:32 +02:00
lars/lthalmann@dl145h.mysql.com
b89dcdffcd
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-10-01 11:24:11 +02:00
svoj@june.mysql.com
0a81f49b25
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG30583/mysql-5.1-engines
2007-10-01 14:23:16 +05:00
mhansson/martin@linux-st28.site
967c782fa7
Merge linux-st28.site:/home/martin/mysql/src/bug30832/my50-bug30832
...
into linux-st28.site:/home/martin/mysql/src/bug30832/my51-bug30832
2007-10-01 09:11:45 +02:00
davi@moksha.local
80618e723e
Merge moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
...
into moksha.local:/Users/davi/mysql/push/bugs/21136-regression
2007-09-29 16:06:46 -03:00
davi@moksha.local
f3b6d56fb2
The fix for BUG 21136 (ChangeSet@1.2611.1.1) introduced a regression that
...
caused a few tests to fail because the thd->extra_lock wasn't being set to
NULL after the table was unlocked. This poses a serious problem because later
attempts to access thd->extra_lock (now a dangling pointer) will probably
result in a crash (undefined behavior) -- and that's what actually happens
in some test cases.
The solution is to set the select_create::m_plock pointee to NULL, which
means that thd->extra_lock is set to NULL when the lock data is not for a
temporary table.
2007-09-29 16:04:31 -03:00