mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
50314 commits 2784 branches 343 tags 1.6 GiB
Commit graph

50314 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:15:09 -06:00
tsmith@ramayana.hindu.god
070dc3ffb5 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-10 14:12:36 -06:00
tsmith@ramayana.hindu.god
f6d110dc20 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:01:48 -06:00
tsmith@ramayana.hindu.god
ced64f8582 Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback() 
Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
fix is to check thd for NULL before using it.
 2007-10-10 14:00:57 -06:00
kaa@polly.(none)
a2cbac3705 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-11 00:00:50 +04:00
kaa@polly.(none)
4e146f3a15 Merge polly.(none):/home/kaa/src/maint/bug28878/my51-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-10 23:54:35 +04:00
kaa@polly.(none)
03c78594a3 Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-10 23:46:16 +04:00
kaa@polly.(none)
12b6074161 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-10 23:44:01 +04:00
kaa@polly.(none)
9a0b9e03d4 Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
 2007-10-10 23:39:53 +04:00
istruewing@stella.local
63b81a82d4 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-10 21:25:57 +02:00
istruewing@stella.local
0ab9d3718d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-10 21:25:19 +02:00
kaa@polly.(none)
7bd5aa9bd6 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/bug28878/my51-bug28878
 2007-10-10 23:23:15 +04:00
kaa@polly.(none)
7ed0b70cce Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878 
into  polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878
 2007-10-10 23:16:12 +04:00
dkatz@damien-katzs-computer.local
a234b8f365 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
 2007-10-10 14:48:25 -04:00
dkatz@damien-katzs-computer.local
ae22204c36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
 2007-10-10 14:46:30 -04:00
istruewing@stella.local
da9b4288ed Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-10-10 20:44:05 +02:00
tsmith@ramayana.hindu.god
26b38b04ed Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 10:10:46 -06:00
istruewing@stella.local
5777cc2998 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  stella.local:/home2/mydev/mysql-5.1-bug15522
 2007-10-10 16:52:56 +02:00
anozdrin/alik@station.
ac83b3122c Fix for BUG#20023: mysql_change_user() resets the value 
of SQL_BIG_SELECTS.

The bug was that SQL_BIG_SELECTS was not properly set
in COM_CHANGE_USER.

The fix is to update SQL_BIG_SELECTS properly.
 2007-10-10 17:57:01 +04:00
anozdrin/alik@station.
05cf10bdf6 Cleanup sp.test. 2007-10-10 14:42:29 +04:00
anozdrin/alik@station.
c6c419f919 Fix automerge. 2007-10-10 13:53:24 +04:00
anozdrin/alik@station.
50c8101ad8 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2007-10-10 13:35:40 +04:00
mattiasj@mattiasj-laptop.(none)
312886fc2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30484
 2007-10-10 08:30:02 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
ac0cf72c06 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b29444/b29444.5.1
 2007-10-10 10:20:19 +05:00
tsmith@ramayana.hindu.god
d207867cf5 Fix compiler warning (use correct data type) 2007-10-09 18:45:29 -06:00
malff@lambda.hsd1.co.comcast.net.
190bb6bf4c Fixed packet length for embedded tests 2007-10-09 18:12:13 -06:00
davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br
0e9ccab47c Merge virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/bugs/28318-5.0 
into  virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/mysql-5.0-runtime
 2007-10-09 20:48:37 -03:00
davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br
fd3c6b1855 Bug#28318 CREATE FUNCTION (UDF) requires a schema 
Bug#29816 Syntactically wrong query fails with misleading error message

The core problem is that an SQL-invoked function name can be a <schema
qualified routine name> that contains no <schema name>, but the mysql
parser insists that all stored procedures (function, procedures and
triggers) must have a <schema name>, which is not true for functions.
This problem is especially visible when trying to create a function
or when a query contains a syntax error after a function call (in the
same query), both will fail with a "No database selected" message if
the session is not attached to a particular schema, but the first
one should succeed and the second fail with a "syntax error" message.

Part of the fix is to revamp the sp name handling so that a schema
name may be omitted for functions -- this means that the internal
function name representation may not have a dot, which represents
that the function doesn't have a schema name. The other part is
to place schema checks after the type (function, trigger or procedure)
of the routine is known.
 2007-10-09 20:46:33 -03:00
tsmith@ramayana.hindu.god
d5740ef051 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-09 13:59:11 -06:00
tsmith@ramayana.hindu.god
e2bfd46b42 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-09 13:58:48 -06:00
tsmith@ramayana.hindu.god
f8c51358fc Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-09 13:56:47 -06:00
tsmith@ramayana.hindu.god
3495096682 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-09 13:50:50 -06:00
tsmith@ramayana.hindu.god
ed8c737a75 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-09 13:49:58 -06:00
davi@moksha.com.br
c3d06676f8 Merge moksha.com.br:/Users/davi/mysql/push/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/push/bugs/31409-5.0
 2007-10-09 16:27:54 -03:00
ramil/ram@ramil.myoffice.izhnet.ru
0783ae86cd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/mysql-5.1-maint
 2007-10-09 22:52:38 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
2264c007f6 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/mysql-5.1-maint
 2007-10-09 22:51:17 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fa5eb277ec metadata test of bug # 31249: problem with convert(..., datetime) removed 
as PS protocol gives slightly different metadata.
 2007-10-09 22:40:22 +05:00
tsmith@ramayana.hindu.god
b606ad3888 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-09 10:59:53 -06:00
cmiller@zippy.cornsilk.net
b0ef3979d0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-10-09 11:04:45 -04:00
davi@moksha.local
7252cbe1e0 Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements 
This deadlock occurs when a client issues a HANDLER ... OPEN statement
that tries to open a table that has a pending name-lock on it by another
client that also needs a name-lock on some other table which is already
open and associated to a HANDLER instance owned by the first client.
The deadlock happens because the open_table() function will back-off
and wait until the name-lock goes away, causing a circular wait if some
other name-lock is also pending for one of the open HANDLER tables.

Such situation, for example, can be easily repeated by issuing a RENAME
TABLE command in such a way that the existing table is already open
as a HANDLER table by another client and this client tries to open
a HANDLER to the new table name.

The solution is to allow handler tables with older versions (marked for
flush) to be closed before waiting for the name-lock completion. This is
safe because no other name-lock can be issued between the flush and the
check for pending name-locks.

The test case for this bug is going to be committed into 5.1 because it
requires a test feature only avaiable in 5.1 (wait_condition).
 2007-10-09 12:02:59 -03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e908bb72e5 Fix for bug #29444: crash with partition refering to table in create-select 
Problem: creating a partitioned table during name resolution for the 
partition function we search for column names in all parts of the
CREATE TABLE query. It is superfluous (and wrong) sometimes.

Fix: launch name resolution for the partition function against
the table we're creating.
 2007-10-09 19:16:39 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
9a62a07837 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31438/b31438.5.1
 2007-10-09 18:18:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a861449596 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31249/b31249.5.0
 2007-10-09 18:14:13 +05:00
davi@moksha.local
efdd32ced3 Merge moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime 
into  moksha.local:/Users/davi/mysql/push/mysql-5.1-runtime
 2007-10-09 09:48:49 -03:00
istruewing@stella.local
ac70638d5a Merge stella.local:/home2/mydev/mysql-5.0-bug15522 
into  stella.local:/home2/mydev/mysql-5.1-bug15522
 2007-10-09 14:18:10 +02:00
istruewing@stella.local
a1caefe36c Merge stella.local:/home2/mydev/mysql-5.0-bug15522-old 
into  stella.local:/home2/mydev/mysql-5.0-bug15522
 2007-10-09 13:38:46 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
b1ffa1605e Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31438/b31438.5.1
 2007-10-09 16:34:56 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
1e4ff5c09b Merge mysql.com:/home/ram/work/b31249/b31249.5.0 
into  mysql.com:/home/ram/work/b31249/b31249.5.1
 2007-10-09 16:21:27 +05:00
istruewing@stella.local
1285baf608 Bug#15522 - create ... select and with merge tables 
Added test case.
The fix for Bug#20662 does also fix this one.
 2007-10-09 13:10:51 +02:00
anozdrin/alik@station.
27ee6db9db Fix merge. 2007-10-09 14:53:15 +04:00