evgen@moonbone.local
4282753626
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/25172-bug-5.0-opt-mysql
2007-01-19 19:36:41 +00:00
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
0343fd801c
Merge recycle.(none):/src/bug22807/my51-bug22807
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-19 13:19:12 -05:00
iggy@recycle.(none)
d6d5195cbd
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/bug22807/my51-bug22807
2007-01-19 13:11:03 -05:00
iggy@recycle.(none)
d3e6cb6b3b
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
2007-01-19 13:09:48 -05:00
jonas@perch.ndb.mysql.com
9bef4afe9f
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 19:00:12 +01:00
igor@olga.mysql.com
ee67d30be8
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25580
2007-01-19 09:09:54 -08:00
kroki/tomash@moonlight.home
6b19250759
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug25211
2007-01-19 20:04:05 +03:00
cmiller@zippy.cornsilk.net
80e1798521
Add missing version delimiter.
2007-01-19 11:30:40 -05:00
cmiller@zippy.cornsilk.net
aaa7257b02
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-19 11:10:38 -05:00
jonas@perch.ndb.mysql.com
372cbc1def
ndb - bug#19645
...
fix some more sp100 hang cases
2007-01-19 17:01:52 +01:00
igor@olga.mysql.com
f346abb5ea
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25580
2007-01-19 08:00:29 -08:00
evgen@moonbone.local
d7d5db64ec
Bug#25172: Not checked buffer size leads to a server crash.
...
After fix for bug#21798 JOIN stores the pointer to the buffer for sorting
fields. It is used while sorting for grouping and for ordering. If ORDER BY
clause has more elements then the GROUP BY clause then a memory overrun occurs.
Now the length of the ORDER BY list is always passed to the
make_unireg_sortorder() function and it allocates buffer big enough to be
used for bigger list.
2007-01-19 18:34:09 +03:00
kroki/tomash@moonlight.home
68a4db3503
BUG#25211: events_bugs.test fails on sapsrv1
...
The problem was that the events_bugs test could randomly fail due to
races in the test case.
The solution is to replace fixed sleeps with reliable polling of a
certain state to settle. For that, a new auxiliary script
include/wait_condition.inc is used, that allows waiting for a given
query to return true.
2007-01-19 18:33:48 +03:00
cmiller@zippy.cornsilk.net
20faa77a5f
Rearrange disable_warnings to enclose the warning emitters properly.
2007-01-19 10:33:07 -05:00
jonas@perch.ndb.mysql.com
1c62054244
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
2007-01-19 15:05:28 +01:00
cmiller@zippy.cornsilk.net
e297ac6699
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-19 09:03:32 -05:00
jonas@perch.ndb.mysql.com
c8f5f7483b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:02:29 +01:00
jonas@perch.ndb.mysql.com
31824a1329
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-19 15:00:49 +01:00
cmiller@zippy.cornsilk.net
85eb07ff98
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-19 08:56:33 -05:00
cmiller@zippy.cornsilk.net
a8ff939d83
The rpl tree added a test case, and another source added a warning,
...
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
2007-01-19 08:56:06 -05:00
istruewing@chilla.local
2a0ca5df8c
Merge chilla.local:/home/mydev/mysql-5.0-bug24607
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-19 13:08:09 +01:00
istruewing@chilla.local
8b77bd979d
After merge fix
2007-01-19 13:06:22 +01:00
kaa@polly.local
4b36a96ed5
Merge polly.local:/tmp/maint/bug23814/my51-bug23814
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-19 14:29:18 +03:00
msvensson@pilot.mysql.com
6c86a309f5
Update result file to 5.1 format
2007-01-19 12:18:18 +01:00
kaa@polly.local
71a292cac1
Fix for the bug #23814 "mysqlimport crashes"
...
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
2007-01-19 14:14:11 +03:00
msvensson@pilot.mysql.com
a15a7d3791
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-engines
2007-01-19 12:04:55 +01:00
msvensson@pilot.mysql.com
009324b12b
Use $MYSQLTESTVARDIR
2007-01-19 12:03:03 +01:00
joerg@trift2.
9d4f594ac9
cmd-line-utils/readline/undo.c : Replace an "uint" cast by the expanded "unsigned int" (compile problem on QNX).
2007-01-19 11:58:29 +01:00
tomas@poseidon.mysql.com
9ca0af92b1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-19 11:36:39 +01:00
tomas@poseidon.mysql.com
9c8ab666b0
Bug#25387 ndb: dbug assert in reference counting for event operations
...
- on blob part execute failure, must leave in state executin, and await dropEventOperation
2007-01-19 11:35:00 +01:00
msvensson@pilot.mysql.com
4dbfac2a5c
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-19 11:12:24 +01:00
msvensson@pilot.mysql.com
b1a9115d88
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-19 11:11:34 +01:00
msvensson@pilot.mysql.com
f22549a8c0
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-19 11:10:16 +01:00
msvensson@pilot.mysql.com
2c60829f3b
Bug #15518 Reusing a stmt that has failed during prepare does not clear error
...
- Additional patch removing check for mysql_errno on already closed
mysql1
2007-01-19 11:07:20 +01:00
igor@olga.mysql.com
3c814f2243
Fixed bug #25219 : crash for a query that contains an EXIST subquery with
...
UNION over correlated and uncorrelated SELECTS.
In such subqueries each uncorrelated SELECT should be considered as
uncacheable. Otherwise join_free is called for it and in many cases
it causes some problems.
2007-01-19 00:17:28 -08:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ad42530481
after merge fix.
2007-01-19 12:15:44 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-19 08:56:03 +04:00
ramil/ram@myoffice.izhnet.ru
1b488c7fbe
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-19 08:54:10 +04:00
malff/marcsql@weblab.(none)
60d5dc9d74
Manual merge
2007-01-18 21:30:25 -07:00
jonas@perch.ndb.mysql.com
7aeddb4ce2
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2007-01-19 04:37:23 +01:00
jonas@perch.ndb.mysql.com
8aea461461
ndb - bug#25711
...
fix cpu peak in big clusters during unpack of config
2007-01-19 04:36:33 +01:00
malff/marcsql@weblab.(none)
a0c1c61b1f
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-24562-merge
2007-01-18 18:43:11 -07:00
malff/marcsql@weblab.(none)
4064c89d24
Manual merge
2007-01-18 18:37:52 -07:00
malff/marcsql@weblab.(none)
cacaa52bd9
Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-24562
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-24562-merge
2007-01-18 17:02:02 -07:00
malff/marcsql@weblab.(none)
436e1f591a
Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts)
...
WL#3681 (ALTER TABLE ORDER BY)
Before this fix, the ALTER TABLE statement implemented an ORDER BY option
with the following characteristics :
1) The order by clause accepts a list of criteria, with optional ASC or
DESC keywords
2) Each criteria can be a general expression, involving operators,
native functions, stored functions, user defined functions, subselects ...
With this fix :
1) has been left unchanged, since it's a de-facto existing feature,
that was already present in the code base and partially covered in the test
suite. Code coverage for ASC and DESC was missing and has been improved.
2) has been changed to limit the kind of criteria that are permissible:
now only a column name is valid.
2007-01-18 16:53:49 -07:00
cmiller@zippy.cornsilk.net
d0a2f4d9b8
Fix merge problem.
2007-01-18 18:02:58 -05:00
tsmith@siva.hindu.god
f4354a87d7
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 13:27:51 -07:00
tsmith@siva.hindu.god
f135f34ebc
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 13:26:48 -07:00
tsmith@siva.hindu.god
f5aab8b213
ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
2007-01-18 13:26:26 -07:00