istruewing@chilla.local
16cadbb374
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1--main
2007-03-25 15:11:16 +02:00
istruewing@chilla.local
4e62cae016
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0--team
2007-03-25 14:44:16 +02:00
istruewing@chilla.local
3a4038ba0d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0--main
2007-03-25 14:40:25 +02:00
serg@sergbook.mysql.com
1af6b027d6
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-24 14:05:27 +02:00
serg@sergbook.mysql.com
18a01e7261
nptl: typo fixed. sigaddset restored
2007-03-24 14:03:27 +02:00
mskold/marty@mysql.com/linux.site
daec2ad6d4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-03-24 08:21:59 +01:00
tsmith@siva.hindu.god
47cce188b3
Bug #24563 : MBROverlaps does not seem to function propertly.
...
Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).
Add tests for all MBR* functions for various combinations of shapes, lines and points.
2007-03-23 16:28:07 -06:00
dkatz/Damien@damiendev.
53ecf4207e
bug#26346
...
Added some fixes for an existing memory leak and unitilialized variables, both caught by gcc.
2007-03-23 18:15:11 -04:00
serg@sergbook.mysql.com
77718a3fc1
bug in im* tests - missing --no-defaults in the mysql command line
2007-03-23 22:16:32 +02:00
serg@sergbook.mysql.com
e4164cda68
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 20:39:34 +02:00
serg@sergbook.mysql.com
d2d72bfc58
reverted linuxthreads thr_client_alarm fix (not future-proof)
...
fixed differently: wake up select_thread with THR_SERVER_ALARM instead
2007-03-23 20:37:20 +02:00
Kristofer.Pettersson@naruto.
fe43de3929
Merge naruto.:C:/cpp/bug20777/my50-bug20777
...
into naruto.:C:/cpp/mysql-5.0-runtime
2007-03-23 19:14:13 +01:00
msvensson@pilot.blaudden
696102a8c6
Bug#26837 Return value ignored for packet->append() call within Log_event::read_log_event
...
- Improve error handling for "out of memory" problems when master is
sending logs to slave. If memory allocation fails the log should
now report error "memory allocation failed reading log event"
2007-03-23 19:00:34 +01:00
dkatz/Damien@damiendev.
b712e2fe28
Merge damiendev.:C:/build/mysql-5.0
...
into damiendev.:C:/build/dev50
2007-03-23 13:43:46 -04:00
tomas@whalegate.ndb.mysql.com
41dfbb6f2b
enabled and extended single user test
2007-03-23 17:14:38 +01:00
tomas@whalegate.ndb.mysql.com
a837d95d53
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
2007-03-23 17:07:33 +01:00
msvensson@pilot.blaudden
d8ab3024a4
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 16:44:33 +01:00
msvensson@pilot.blaudden
a1e7778642
Import patch from yaSSL after fixing warnings upstream
2007-03-23 16:41:17 +01:00
serg@sergbook.mysql.com
3e9d98b039
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 16:37:19 +02:00
serg@sergbook.mysql.com
1d64408cd5
Merge bk-internal:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 16:32:42 +02:00
serg@sergbook.mysql.com
e786458d14
Merge bk-internal:/home/bk/mysql-4.1-build
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2007-03-23 16:05:02 +02:00
tomas@whalegate.ndb.mysql.com
6c4a7a4469
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
2007-03-23 14:09:30 +01:00
serg@sergbook.mysql.com
b37c197512
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2007-03-23 14:57:55 +02:00
tomas@whalegate.ndb.mysql.com
29ac950b6f
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
2007-03-23 13:52:03 +01:00
serg@sergbook.mysql.com
e2dd5743b9
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2007-03-23 14:47:51 +02:00
msvensson@pilot.blaudden
c06e2804d3
Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 13:40:57 +01:00
tomas@poseidon.mysql.com
210d055000
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-23 13:10:58 +01:00
serg@sergbook.mysql.com
2220fe2774
move thr_client_alarm initialization to mysqld.cc
...
(in thr_alarm.cc it happened too late).
2007-03-23 13:38:42 +02:00
msvensson@pilot.blaudden
a552a07c55
Backport from 5.1, limit SHOW VARIABLES to "log_bin%"
2007-03-23 12:35:30 +01:00
msvensson@pilot.blaudden
7216b67a8c
Import yassl 1.6.0
2007-03-23 11:52:25 +01:00
msvensson@pilot.blaudden
da9fa2cfeb
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 11:31:22 +01:00
msvensson@pilot.blaudden
aed2a676a7
Merge pilot.blaudden:/home/msvensson/mysql/bug26233/my50-bug26233
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 11:26:00 +01:00
msvensson@pilot.blaudden
cd5e553267
Bug#27070 server logs are created unrequested and in wrong directory
...
- Add output path for slow queries as well
2007-03-23 11:18:59 +01:00
joerg@trift2.
a1ffb00288
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:13:15 +01:00
joerg@trift2.
4ab912c92a
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:10:27 +01:00
msvensson@pilot.blaudden
593ef42606
Bug#26233 very suspect code in mf_tempfile.c, in function create_temp_file()
...
- Rework the windows implementation in 'create_temp_file' to be
thread safe by using GetTempFileName instad of fiddling
with "environ"
2007-03-23 11:01:47 +01:00
gkodinov/kgeorge@magare.gmz
081f43cc51
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26186-5.0-opt
2007-03-23 10:11:09 +02:00
istruewing@chilla.local
af850a24f8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug26996
2007-03-23 08:28:21 +01:00
igor@olga.mysql.com
92d1d74037
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27229
2007-03-22 14:51:20 -07:00
igor@olga.mysql.com
8f9178e857
Fixed bug #27229 : crash when a set function aggregated in outer
...
context was used as an argument of GROUP_CONCAT.
Ensured correct setting of the depended_from field in references
generated for set functions aggregated in outer selects.
A wrong value of this field resulted in wrong maps returned by
used_tables() for these references.
Made sure that a temporary table field is added for any set function
aggregated in outer context when creation of a temporary table is
needed to execute the inner subquery.
2007-03-22 14:48:03 -07:00
omer@linux.site
6592ecef8b
Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into linux.site:/home/omer/source/bld50_0321
2007-03-22 13:49:47 -07:00
tsmith@siva.hindu.god
8abc953662
NULL MERGE this to 5.1
...
Apply the following InnoDB snapshots:
innodb-5.0-ss1319
innodb-5.0-ss1331
innodb-5.0-ss1333
innodb-5.0-ss1341
Fixes:
- Bug #21409 : Incorrect result returned when in READ-COMMITTED with query_cache ON
At low transaction isolation levels we let each consistent read set
its own snapshot.
- Bug #23666 : strange Innodb_row_lock_time_% values in show status; also millisecs wrong
On Windows ut_usectime returns secs and usecs relative to the UNIX
epoch (which is Jan, 1 1970).
- Bug #25494 : LATEST DEADLOCK INFORMATION is not always cleared
lock_deadlock_recursive(): When the search depth or length is exceeded,
rewind lock_latest_err_file and display the two transactions at the
point of aborting the search.
- Bug #25927 : Foreign key with ON DELETE SET NULL on NOT NULL can crash server
Prevent ALTER TABLE ... MODIFY ... NOT NULL on columns for which
there is a foreign key constraint ON ... SET NULL.
- Bug #26835 : Repeatable corruption of utf8-enabled tables inside InnoDB
The bug could be reproduced as follows:
Define a table so that the first column of the clustered index is
a VARCHAR or a UTF-8 CHAR in a collation where sequences of bytes
of differing length are considered equivalent.
Insert and delete a record. Before the delete-marked record is
purged, insert another record whose first column is of different
length but equivalent to the first record. Under certain conditions,
the insertion can be incorrectly performed as update-in-place.
Likewise, an operation that could be done as update-in-place can
unnecessarily be performed as delete and insert, but that would not
cause corruption but merely degraded performance.
2007-03-22 14:40:52 -06:00
istruewing@chilla.local
a009d2dd6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug26996
2007-03-22 21:34:31 +01:00
evgen@moonbone.local
a2219567a1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
2007-03-22 23:15:30 +03:00
evgen@moonbone.local
38e023781a
sql_view.cc:
...
Post-fix for bug#26813.
2007-03-22 23:13:40 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
fc23f3356e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-23 00:04:47 +04:00
Damien@damiendev.
53679c03ad
Merge damiendev.:C:/build/mysql-5.0
...
into damiendev.:C:/build/dev50
2007-03-22 15:55:18 -04:00
holyfoot/hf@mysql.com/hfmain.(none)
68f9ff123c
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:54:47 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e556a0431b
Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:50:33 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0102d38ef4
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:48:39 +04:00