1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-18 09:50:33 +03:00
Commit Graph

16816 Commits

Author SHA1 Message Date
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
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4e6b8a1d6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b22026/b22026.5.0
2007-01-22 15:28:42 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df4cfc0bc1 after-merge fix. 2007-01-22 15:26:49 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1d9c8c8a3d Merge mysql.com:/home/ram/work/b22026/b22026.5.0
into  mysql.com:/home/ram/work/b22026/b22026.5.1
2007-01-22 14:58:36 +04:00
gkodinov/kgeorge@rakia.gmz
c9df1caac8 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into  rakia.gmz:/home/kgeorge/mysql/autopush/B16590-5.1-opt
2007-01-22 12:58:14 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a079f20aa8 Fix for bug #22026: Warning when using IF statement and large unsigned bigint
We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
2007-01-22 14:52:23 +04:00
gkodinov/kgeorge@macbook.gmz
9ea140d13e BUG#16590: Optimized does not do right "const" table pre-read
st_table::const_key_parts member is used in determining if
 certain key has a prefix that is compared to constant(s) in
 the query predicates.
 If there's such prefix the index can be used to get the data
 from the remaining suffix columns in sorted order.
 However if a field is compared to another field from a "const"
 table the const_key_parts is not amended.
 This makes the optimizer unable to detect that the key can be 
 used for sorting and adds an extra filesort.
 Fixed by updating const_key_parts after reading in the "const"
 table.
2007-01-22 12:51:21 +02:00
msvensson@neptunus.(none)
742af1c2a7 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-22 10:37:59 +01:00
bar@bar.myoffice.izhnet.ru
95f3f3f4f3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
into  mysql.com:/home/bar/mysql-5.1.b24747
2007-01-22 13:28:58 +04:00
knielsen@ymer.(none)
f2bbf5225a Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/x/mysql-5.1-new-maint
2007-01-22 09:00:20 +01:00
knielsen@ymer.(none)
854ef6b0a3 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
2007-01-22 08:59:26 +01:00
knielsen@ymer.(none)
4d7a8de047 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/x/mysql-4.1-maint
2007-01-22 08:58:49 +01:00
tsmith@siva.hindu.god
bcc8452782 Applied innodb-5.1-ss1186
Fixes bugs:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #24741: existing cascade clauses disappear when adding foreign keys
2007-01-21 18:18:11 -07:00
baker@bk-internal.mysql.com
42345b83c3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-21 02:21:23 +01:00
dlenev@mockturtle.local
92704745f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
2007-01-20 14:10:20 +03:00
dlenev@mockturtle.local
8f23e65b00 Fixed test case for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires
global 'opening tables' lock." after merging it into 5.1 tree.
2007-01-20 14:08:53 +03:00
dlenev@mockturtle.local
83bcfa2541 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg25044
2007-01-19 23:23:45 +03:00
dlenev@mockturtle.local
7b1a94ef78 Fix for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires global 'opening
tables' lock."

Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
long time) prevented concurrent execution of all statements using tables.

The problem was caused by the fact that we were holding LOCK_open mutex
during whole duration of this statement and particularly during call
to handler::enable_indexes(). This behavior was introduced as part of the
fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
too late (race cond)"

The patch simply restores old behavior. Note that we can safely do this as
this operation takes exclusive lock (similar to name-lock) which blocks both
DML and DDL on the table being altered.

It also introduces mysql-test/include/wait_show_pattern.inc helper script
which is used to make test-case for this bug robust enough.
2007-01-19 23:15:59 +03:00
igor@olga.mysql.com
b8d55cc449 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 11:36:42 -08:00
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
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
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
msvensson@neptunus.(none)
3b0caab561 Add test's from Matthias for assigning one variable from another using let 2007-01-19 15:43:21 +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
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
msvensson@pilot.mysql.com
6c86a309f5 Update result file to 5.1 format 2007-01-19 12:18:18 +01: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
knielsen@ymer.(none)
ba6e6d0754 Implement mysql-test-run.pl option to limit the number of saved core
files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs.
2007-01-19 09:41:08 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6e91557408 after merge fix. 2007-01-19 12:19:53 +04: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
ce855aba98 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
2007-01-19 09:12:52 +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
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
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