Commit graph

51633 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
9eb0ef8914 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 10:26:01 +01:00
tsmith@ramayana.hindu.god
31a4940b3f Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 15:04:45 -07:00
tsmith@ramayana.hindu.god
4eb097ba12 Add a way to remove options which mysql-test-run.pl no longer uses. 2007-12-07 14:43:31 -07:00
tsmith@ramayana.hindu.god
3b45ef82dd Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 03:59:53 -07:00
tsmith@ramayana.hindu.god
3d01ffd78d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 03:56:03 -07:00
tsmith@ramayana.hindu.god
8c5f194505 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:51:23 -07:00
tsmith@ramayana.hindu.god
04d363d1f6 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-07 03:42:39 -07:00
tsmith@ramayana.hindu.god
bf6292ea97 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:40:18 -07:00
tsmith@ramayana.hindu.god
6835272b37 Make tests more robust (clean up better after grant.test) 2007-12-07 03:39:37 -07:00
tsmith@ramayana.hindu.god
45c7826088 Move the test case for bug #20901 from create.test to grant.test, so
testing embedded server works correctly.
2007-12-07 00:54:32 -07:00
tsmith@ramayana.hindu.god
b922c9646c Fix compiler warning about wrong integer size (probably harmless) 2007-12-06 16:11:26 -07:00
tsmith@ramayana.hindu.god
44d74f631f ctype-simple.c: Backport quick fix to remove Windows compiler warnings 2007-12-06 15:05:24 -07:00
tsmith@ramayana.hindu.god
ac811ce455 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-05 15:31:18 -07:00
tsmith@ramayana.hindu.god
f1323ad628 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-05 15:29:37 -07:00
tsmith@ramayana.hindu.god
c3a0572d8e Post-merge fix (reorder tests in ctype_ucs.test) 2007-12-05 13:54:11 -07:00
tsmith@ramayana.hindu.god
8fc0bfb6b6 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-05 12:33:36 -07:00
davi@endora.local
aa5786eb0f Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-12-05 11:25:51 -02:00
davi@mysql.com/endora.local
b79b57c645 Bug#32996 log_tables.test fails sporadically
Only select entries from the general_log that were issued by the current
connection.
2007-12-05 09:48:13 -02:00
tsmith@ramayana.hindu.god
10cab933b2 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-04 20:58:21 -07:00
tsmith@ramayana.hindu.god
6453025165 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
2007-12-04 19:16:22 -07:00
anozdrin/alik@station.
1bfc9d692c Bug#32966 main.status fails.
Disable failing test case.
2007-12-04 18:52:43 +03:00
anozdrin/alik@station.
69792afb14 Bug#32965 main.ctype_create fails.
Disable failing test case.
2007-12-04 18:51:03 +03:00
kaa@polly.(none)
4e08609f03 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-02 14:18:27 +03:00
kaa@polly.(none)
3ecbd79c88 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-02 14:14:42 +03:00
kaa@polly.(none)
0e78354baa Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-02 14:11:36 +03:00
kaa@polly.(none)
a008572871 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
2007-12-02 13:51:39 +03:00
kaa@polly.(none)
d905aade4f Windows-specific fixes in floating point tests. 2007-12-02 13:49:12 +03:00
kaa@polly.(none)
f123625308 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 15:46:01 +03:00
kaa@polly.(none)
9699c42ccc Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 15:40:59 +03:00
kaa@polly.(none)
2a52bb82e4 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 15:37:25 +03:00
kaa@polly.(none)
c8226d732d Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
2007-12-01 15:30:01 +03:00
kaa@polly.(none)
55acce7504 Fixed the floating point number tests on Windows. 2007-12-01 15:25:24 +03:00
kaa@polly.(none)
bcbd426c7f Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 13:07:07 +03:00
kaa@polly.(none)
a293b12571 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 13:00:44 +03:00
kaa@polly.(none)
0f0051e695 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 12:57:20 +03:00
kaa@polly.(none)
777df295da Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
2007-12-01 12:50:02 +03:00
kaa@polly.(none)
33125cd40e Fixed the build failure on Windows. It does not have trunc() defined in math.h, so we should not use it code. 2007-12-01 12:46:25 +03:00
kaa@polly.(none)
289abcf583 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 10:58:34 +03:00
kaa@polly.(none)
8f13b541a7 Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-12-01 10:53:50 +03:00
kaa@polly.(none)
b994abb997 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-12-01 10:48:41 +03:00
kaa@polly.(none)
109c0439c0 Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
2007-12-01 10:29:43 +03:00
kaa@polly.(none)
7fd9135bb8 Fix for bug #26788 "mysqld (debug) aborts when inserting specific
numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
2007-12-01 10:05:59 +03:00
davi@endora.local
af039c53f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-11-30 14:07:36 -02:00
davi@endora.local
7bdb3219fe Merge mysql.com:/Users/davi/mysql/bugs/22312-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2007-11-30 14:05:58 -02:00
anozdrin/alik@ibm.
8377c71f41 A patch for BUG#32148: killing a query may be ineffective.
The problem was that THD::killed was reset after a command was
read from the socket, but before it was actually handled. That lead
to a race: if another KILL statement was issued for this connection
in the middle of reading from the socket and processing a command,
THD::killed state would be cleaned.

The fix is to move this cleanup into net_send_error() function.

A sample test case exists in binlog_killed.test:
  - connection 1: start a new transaction on table t1;
  - connection 2: send query to the server (w/o waiting for the
    result) to update data in table t1 -- this query will be blocked
    since there is unfinished transaction;
  - connection 1: kill query in connection 2 and finish the transaction;
  - connection 2: get result of the previous query -- it should be
    the "query-killed" error.

This test however contains race condition, which can not be fixed
with the current protocol: there is no way to guarantee, that the
server will receive and start processing the query in connection 2
(which is intended to get blocked) before the KILL command (sent in
the connection 1) will arrive. In other words, there is no way to
ensure that the following sequence will not happen:

  - connection 1: start a new transaction on table t1;
  - connection 1: kill query in connection 2 and finish the transaction;
  - connection 2: send query to the server (w/o waiting for the
    result) to update data in table t1 -- this query will be blocked
    since there is unfinished transaction;
  - connection 2: get result of the previous query -- the query will
    succeed.

So, there is no test case for this bug, since it's impossible
to write a reliable test case under the current circumstances.
2007-11-30 16:12:20 +03:00
anozdrin/alik@ibm.
609a1d0d2d BUG#32723 (grant3.test fails) can not be reproduced.
Enabling the test case.
2007-11-30 14:49:34 +03:00
davi@mysql.com/endora.local
ee9bafc1c5 Bug#22312 Syntax error in expression with INTERVAL()
Parser rejects valid INTERVAL() expressions when associated with
arithmetic operators. The problem is the way in which the expression
and interval grammar rules were organized caused shift/reduce conflicts.

The solution is to tweak the interval rules to avoid shift/reduce
conflicts by removing the broken interval_expr rule and explicitly
specify it's content where necessary.

Original fix by Davi Arnaut, revised and improved rules by Marc Alff
2007-11-30 09:34:25 -02:00
anozdrin/alik@ibm.
a1666e067a A test case for BUG#26676: VIEW using old table schema in a session.
The following clarification should be made in The Manual:

Standard SQL is quite clear that, if new columns are added
to a table after a view on that table is created with
"select *", the new columns will not become part of the view.
In all cases, the view definition (view structure) is frozen
at CREATE time, so changes to the underlying tables do not
affect the view structure.
2007-11-30 12:14:07 +03:00
davi@mysql.com/endora.local
d179bb64c2 Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock
This bug is actually two bugs in one, one of which is CREATE TRIGGER under
LOCK TABLES and the other is CREATE TRIGGER under LOCK TABLES simultaneous
to a FLUSH TABLES WITH READ LOCK (global read lock). Both situations could
lead to a server crash or deadlock.

The first problem arises from the fact that when under LOCK TABLES, if the
table is in the set of locked tables, the table is already open and it doesn't
need to be reopened (not a placeholder). Also in this case, if the table is
not write locked, a exclusive lock can't be acquired because of a possible
deadlock with another thread also holding a (read) lock on the table. The
second issue arises from the fact that one should never wait for a global
read lock if it's holding any locked tables, because the global read lock
is waiting for these tables and this leads to a circular wait deadlock.

The solution for the first case is to check if the table is write locked
and upgraded the write lock to a exclusive lock and fail otherwise for non
write locked tables. Grabbin the exclusive lock in this case also means
to ensure that the table is opened only by the calling thread. The second
issue is partly fixed by not waiting for the global read lock if the thread
is holding any locked tables.

The second issue is only partly addressed in this patch because it turned
out to be much wider and also affects other DDL statements. Reported as
Bug#32395
2007-11-29 09:42:26 -02:00
malff@lambda.hsd1.co.comcast.net.
de0175204d Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 09:08:31 -07:00