Commit graph

39023 commits

Author SHA1 Message Date
evgen@moonbone.local
f967e24718 Bug#30787: Stored function ignores user defined alias.
Simple subselects are pulled into upper selects. This operation substitutes the
pulled subselect for the first item from the select list of the subselect.
If an alias is defined for a subselect it is inherited by the replacement item.
As this is done after fix_fields phase this alias isn't showed if the
replacement item is a stored function. This happens because the Item_func_sp::make_field
function makes send field from its result_field and ignores the defined alias.

Now when an alias is defined the Item_func_sp::make_field function sets it for
the returned field.
2008-01-31 23:46:26 +03:00
kent@kent-amd64.(none)
18bb8de9d6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-01-31 20:36:13 +01:00
kent@mysql.com/kent-amd64.(none)
0c98586bc8 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/build/mysql-4.1-build
2008-01-31 20:35:13 +01:00
mkindahl@dl145h.mysql.com
7cfdd60045 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-31 16:15:46 +01:00
svoj@mysql.com/april.(none)
3b5c25ba65 BUG#22989 - START SLAVE causes Error on COM_REGISTER_SLAVE: 1105
'Wrong parameters to functi

START SLAVE reports vague error when it fails to register on master:
"Wrong parameters to function register_slave".

If master failed to register slave because of too long
'report-host'/'report-user'/'report-password', return better error
messages:
"Failed to register slave: too long 'report-host'"
"Failed to register slave: too long 'report-user'"
"Failed to register slave; too long 'report-password'"

No test case for this fix.
2008-01-31 18:51:20 +04:00
pekka@sama.ndb.mysql.com
e2f23fb8d9 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
2008-01-31 14:24:10 +01:00
pekka@sama.ndb.mysql.com
2b78957875 ndb - bug#34107 patch 2, ndb api 2008-01-31 13:58:29 +01:00
pekka@sama.ndb.mysql.com
ccb79bb8ee ndb - bug#34107 patch 1, kernel 2008-01-31 13:56:12 +01:00
mkindahl@dl145h.mysql.com
10b194d272 Changes to fix tests in pushbuild. 2008-01-31 12:17:40 +01:00
mkindahl@dl145h.mysql.com
b8428d1560 Fixes to make code compile on Windows. 2008-01-31 07:19:29 +01:00
tsmith@ramayana.hindu.god
91a7720ad8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-30 19:08:38 -07:00
tsmith@ramayana.hindu.god
c74959c9e0 Bug #32149 Long semaphore wait for adaptive hash latch
Fix by calling ha_release_temporary_latches() before ::filesort().
2008-01-30 19:00:20 -07:00
cmiller@zippy.cornsilk.net
806ff0187d Bug#24624: MySQL client ignores its own completion table
Nothing was in the command-line dictionary, because of the wrong 
order of instructions when populating it.

This is a smaller, less optimistic patch that both fixes a bug and
refreshes the list of keywords that the command-line library (e.g., 
readline) can use to expand typed commands.  Now, read from the 
command list /after/ we free the list, not before.

The best way is to read the keywords from the lexer code, but that
doesn't work everywhere yet.  Grr.
2008-01-30 16:51:39 -05:00
mkindahl@dl145h.mysql.com
b9b38cb576 Disabling rpl_transaction test for non-debug builds. 2008-01-30 18:24:28 +01:00
mkindahl@dl145h.mysql.com
a440007ca4 Changes to make tests pass in pushbuild. 2008-01-30 15:58:35 +01:00
tomas@whalegate.ndb.mysql.com
4c77586d5c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-01-30 15:36:46 +01:00
jonas@perch.ndb.mysql.com
f16b8a1931 ndb - bug#34160
make sure release of not added ptr does not corrupt hashtable
2008-01-30 11:58:10 +01:00
mkindahl@dl145h.mysql.com
716c63ebaa Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-30 11:25:54 +01:00
hezx@mail.hezx.com
afe8ac3128 Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug26489_corruption_in_relay_log/5.0
2008-01-30 16:40:36 +08:00
jonas@perch.ndb.mysql.com
4230b1b53e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  perch.ndb.mysql.com:/home/jonas/src/50-ndb
2008-01-30 08:10:37 +01:00
jonas@perch.ndb.mysql.com
0c03b509eb ndb - bug#30172
Backup can assert with "big" table definitions
  Correct condition before fetching next meta-table
  Increase meta-buffer, to cope with atleast 2 tables
2008-01-30 08:09:56 +01:00
cmiller@zippy.cornsilk.net
3e23741bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
2008-01-29 18:23:40 -05:00
cmiller@zippy.cornsilk.net
c3a92a661c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint--bug33841
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-build
2008-01-29 17:18:27 -05:00
hezx@mail.hezx.com
7572a9e391 update test result 2008-01-29 19:21:21 +08:00
istruewing@stella.local
252dcbe8d0 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2008-01-29 10:14:28 +01:00
hezx@mail.hezx.com
e4f37eab56 BUG#26489 Corruption in relay logs
Here is the scenario that causes the failure.(by Mats)

1. The to-be corrupt log event (let's call it X), is split into two
   packets B and C on the network level (net_write_buff()). The parts
   are X = (x',x''). The part x' ends up in packet B and part x''
   ends up in packet C. Prior to the corrupt event X, the event Y has
   been written successfully, but has been split into two packets as
   well, which we call (y',y'').
2. The master sends packet A = (y'',x') to the slave, increases the
   packet sequence number, the slave receives the packet, but fails
   to reply before the master gets a timeout.
3. Since the master got a timeout, it reports failure, and aborts
   sending the binary log by exiting mysql_binlog_send(). However, it
   leaves the buffer intact, still holding y'' (but not x', since the
   write_pos is not increased).
4. After exiting mysql_binlog_send(), the master does a
   disconnection of the client thread, which involves sending an
   error message e to the client (i.e., the slave).
5. In this case, net_write_buff() is used again, but this time the
   old contents of the packet is used so that the new packet is
   D = (y'',e). Note that this will use a new packet sequence number,
   since the packet number was increased in step 2.
6. The slave receives the tail y'' of the Y log event, concatenates
   this with x' (which it already received), and writes the event
   (x',y'') it to the relay log since it hasn't noticed anything is
   amiss.
7. It then tries to read more bytes, which is either e (if the length
   given for X just happened to match the length given for Y, or just
   plain garbage because the slave is out of sync with what is
   actually sent.
8. After a while, the SQL thread tries to execute the event (x',y''),
   which is very likely to be just nonsense.

The problem can be fixed by not resetting net->error after the call of 
mysql_binlog_send, so the error message will not be sent and the connection
will be closed.
2008-01-29 11:56:48 +08:00
joerg@trift2.
3c5ca383bf Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2008-01-28 16:01:50 +01:00
joerg@trift2.
a6f257361e Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-01-28 15:05:33 +01:00
joerg@trift2.
e0db1853e8 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2008-01-28 15:03:19 +01:00
tsmith@ramayana.hindu.god
1bf737a152 Fix test case for Bug #25347 so that it actually tests the code fix,
and so that it works correctly on Windows.
2008-01-27 14:28:50 -07:00
pekka@sama.ndb.mysql.com
7bf78e09d3 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug31477
2008-01-27 17:26:27 +01:00
pekka@sama.ndb.mysql.com
bf5c1848d9 ndb - bug#31477 - 5.0 2008-01-27 16:41:29 +01:00
igor@olga.mysql.com
5e14047e23 Fixed bug #33833.
Two disjuncts containing equalities of the form key=const1 and key=const2 can
be merged into one if const1 is equal to const2. To check it the common 
collation of the constants were used rather than the collation of the field key.
For example when the default collation of the constants was cases insensitive
while the collation of the field was case sensitive, then two or-ed equality 
predicates key='b' and key='B' incorrectly were merged into one f='b'. As a 
result ref access was used instead of range access and wrong result sets were 
returned in many cases. 
Fixed the problem by comparing constant in the or-ed predicate with collation of
the key field.
2008-01-26 21:45:35 -08:00
tsmith@ramayana.hindu.god
218627aa33 Un-break test case on Windows, for bug #25347 2008-01-25 16:00:15 -07:00
tsmith@ramayana.hindu.god
f522912d20 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-25 10:03:15 -07:00
mskold/marty@quadfish.(none)
187358286c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.0-ndb
2008-01-25 17:28:35 +01:00
cmiller@zippy.cornsilk.net
b040a97c2a Bug#33841: mysql client crashes when returning results for long-\
running queries

Bug#33976: buffer overflow of variable time_buff in function com_go()

An internal buffer was too short.  Overextending could smash the 
stack on some architectures and cause SEGVs.  This is not a problem
that could be exploited to run arbitrary code.

To fix, I expanded one buffer to cover all the size that could be
written to (we know the abolute max).
2008-01-25 10:53:21 -05:00
hezx@mail.hezx.com
750c4022f2 BUG#33862 completely failed DROP USER statement gets replicated
The problem is when create/rename/drop users, the statement was logged regardless of error, even if no data has been changed, the statement was logged.

After this patch, create/rename/drop users don't write the binlog if the statement makes no changes, if the statement does make any changes, log the statement with possible error code.

This patch is based on the patch for BUG#29749, which is not pushed
2008-01-25 15:02:26 +08:00
istruewing@stella.local
0bca9c4e50 Merge stella.local:/home2/mydev/mysql-5.0-amain
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2008-01-24 19:25:59 +01:00
anozdrin/alik@quad.
1c1401bbb2 Merge quad.:/mnt/raid/alik/MySQL/devel/5.0
into  quad.:/mnt/raid/alik/MySQL/devel/5.0-rt-merged-5.0
2008-01-24 17:37:16 +03:00
tsmith@ramayana.hindu.god
3ba8a94bd0 Fix bug in BK trigger for sending changes to InnoDB devs. 2008-01-24 00:31:47 -07:00
tsmith@ramayana.hindu.god
525028794d Merge ramayana.hindu.god:/home/tsmith/m/inno/jan23/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-23 18:20:39 -07:00
tsmith@ramayana.hindu.god
fa257c031c Applied innodb-5.0-ss2223 snapshot
Fixes:

Bug #32083: server crashes on show status when InnoDB is not initialized
  innodb_export_status(): Check that InnoDB has been initialized
  before invoking srv_export_innodb_status().  (Bug #32083)
  This bug does not exist in MySQL/InnoDB 5.1.
2008-01-23 18:20:04 -07:00
tsmith@ramayana.hindu.god
6dabb0d48d Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggers
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-01-23 16:33:10 -07:00
tsmith@ramayana.hindu.god
c40e1ab171 Add triggers to notify InnoDB developers when MySQL developers change files
that they control.
2008-01-23 16:18:23 -07:00
malff@lambda.hsd1.co.comcast.net.
7bd56cfa79 manual merge 2008-01-23 14:52:40 -07:00
malff@lambda.hsd1.co.comcast.net.
1eecc24a21 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618
2008-01-23 14:04:46 -07:00
tomas@whalegate.ndb.mysql.com
3bbbdc09ee correct result to be the same as in 5.0 2008-01-23 21:51:01 +01:00
malff@lambda.hsd1.co.comcast.net.
c3ad0cac75 Bug#33618 (Crash in sp_rcontext)
Bug 33983 (Stored Procedures: wrong end <label> syntax is accepted)

The server used to crash when REPEAT or another control instruction
was used in conjunction with labels and a LEAVE instruction.

The crash was caused by a missing "pop" of handlers or cursors in the
code representing the stored program. When executing the code in a loop,
this missing "pop" would result in a stack overflow, corrupting memory.

Code generation has been fixed to produce the missing h_pop/c_pop
instructions.

Also, the logic checking that labels at the beginning and the end of a
statement are matched was incorrect, causing Bug 33983.
End labels, when used, must match the label used at the beginning of a block.
2008-01-23 13:26:41 -07:00
tsmith@ramayana.hindu.god
ff4835385a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2008-01-23 11:48:29 -07:00