Commit graph

17127 commits

Author SHA1 Message Date
kostja@bodhi.(none)
87a75bdf30 A number of fixes after a merge from the main 5.1 tree:
the local tree contains a fix for 
Bug#32748 "Inconsistent handling of assignments to 
general_log_file/slow_query_log_file",
which changes output of a number of tests.
2008-05-20 22:23:58 +04:00
kostja@bodhi.(none)
2c0ce2a832 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-27430
2008-05-20 11:38:17 +04:00
gshchepa/uchum@host.loc
d044d9f00b Merge host.loc:/work/bk/5.0-bugteam
into  host.loc:/work/bk/5.1-bugteam
2008-05-18 14:27:44 +05:00
gshchepa/uchum@host.loc
80b16212c3 Merge host.loc:/work/bugs/5.0-bugteam-36676
into  host.loc:/work/bk/5.0-bugteam
2008-05-18 14:27:17 +05:00
gshchepa/uchum@host.loc
2459d3a9ad Fixed bug#36676: multiupdate using LEFT JOIN updates only
first row or fails with an error:
  ERROR 1022 (23000): Can't write; duplicate key in table ''

The server uses intermediate temporary table to store updated
row data.  The first column of this table contains rowid.
Current server implementation doesn't reset NULL flag of that
column even if the server fills a column with rowid.
To keep each rowid unique, there is an unique index.
An insertion into an unique index takes into account NULL
flag of key value and ignores real data if NULL flag is set.
So, insertion of actually different rowids may lead to two
kind of problems.  Visible effect of each of these problems
depends on an initial engine type of temporary table:

1. If multiupdate initially creates temporary table as
a MyISAM table (a table contains blob columns, and the
create_tmp_table function assumes, that this table is
large), it inserts only one single row and updates
only rows with one corresponding rowid. Other rows are
silently ignored. 

2. If multiupdate initially creates MEMORY temporary
table, fills it with data and reaches size limit for
MEMORY tables (max_heap_table_size), multiupdate
converts MEMORY table into MyISAM table and fails
with an error:
  ERROR 1022 (23000): Can't write; duplicate key in table ''


Multiupdate has been fixed to update the NULL flag of
temporary table rowid columns.
2008-05-18 14:21:25 +05:00
cmiller@zippy.cornsilk.net
c1f35308cb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam
2008-05-16 17:48:07 -04:00
cmiller@zippy.cornsilk.net
34deab48db Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-bugteam
2008-05-16 17:40:01 -04:00
gkodinov/kgeorge@magare.gmz
b98922b7cc Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
2008-05-16 19:03:50 +03:00
gkodinov/kgeorge@magare.gmz
0b7abbecbe Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B36011-take2-5.0-bugteam
2008-05-16 18:56:43 +03:00
cmiller@zippy.cornsilk.net
944f793b90 Add a test at Andrei's behest. Show the SHOW CREATE on the
master also, so that we can visually see the slave is the same.
2008-05-16 11:26:29 -04:00
gkodinov/kgeorge@magare.gmz
df3341a764 Bug #36011: server crash with explain extended on query
with dependent subqueries
An IN subquery is executed on EXPLAIN when it's not correlated.
If the subquery required a temporary table for its execution
not all the internal structures were restored from pointing to
the items of the temporary table to point back to the items of
the subquery.
Fixed by restoring the ref array when a temp tables were used in
executing the IN subquery during EXPLAIN EXTENDED.
2008-05-16 17:05:55 +03:00
cmiller@zippy.cornsilk.net
eee06ff14b Updated to address Davi's complaint about missing binlog. 2008-05-16 09:15:56 -04:00
gshchepa/uchum@host.loc
4dfd740683 Merge host.loc:/work/bugs/5.0-bugteam-36488
into  host.loc:/work/bk/5.0-bugteam
2008-05-16 13:00:12 +05:00
gshchepa/uchum@host.loc
a91e995c0c Merge host.loc:/work/bugs/5.0-bugteam-36488
into  host.loc:/work/bk/5.1-bugteam
2008-05-16 12:59:32 +05:00
cmiller@zippy.cornsilk.net
573828aa6a Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \
slave

The stored-routine code took the contents of the (lowest) parser
and copied it directly to the binlog, which causes problems if there
is a special case of interpretation at the parser level -- which 
there is, in the "/*!VER */" comments.  The trailing "*/" caused
errors on the slave, naturally.

Now, since by that point we have /properly/ created parse-tree (as 
the rest of the server should do!) for the stored-routine CREATE, we
can construct a perfect statement from that information, instead of
writing uncertain information from an unknown parser state.  
Fortunately, there's already a function nearby that does exactly 
that.
---
Update for Bug#36570.  Qualify routine names with db name when
writing to the binlog ONLY if the source text is qualified.
2008-05-15 19:13:24 -04:00
gkodinov/kgeorge@magare.gmz
80c7d949e3 Disable thread_cache_size_func as reported in bug 36733 2008-05-15 12:50:04 +03:00
gkodinov/kgeorge@magare.gmz
8e359cf0f8 Bug #32966: status still fails : disabling 2008-05-14 15:45:42 +03:00
thek@adventure.(none)
2d8a54af31 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
2008-05-14 13:12:25 +02:00
thek@adventure.(none)
57f94e48df Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
2008-05-14 11:14:04 +02:00
tnurnberg@noir.wlan.koehntopp.de
742e84d710 Bug#36522: Some tests of system variables have diffs on 64bit platorms
temporary mass-disable of affected tests
2008-05-14 11:11:09 +02:00
tnurnberg@noir.wlan.koehntopp.de
71fdcc349c revert the following CS on grounds of "right patch, wrong time":
"Apply InnoDB snapshot innodb-5.1-ss2438.

  Addresses the following bugs:

  Change the fix for Bug#32440 to show bytes instead of kilobytes in
  INFORMATION_SCHEMA.TABLES.DATA_FREE.

  branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected
  In InnoDB, the row count is only a rough estimate used by SQL
  optimization. InnoDB is now return row count 0 for TRUNCATE operation.

  branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update
  and handler_delete
  Add the calls to ha_statistic_increment() in ha_innobase::delete_row()
  and ha_innobase::update_row().

  Fix Bug#36169 create innodb compressed table with too large row size crash
  Sometimes it is possible that
  row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in
  row_create_index_for_mysql() when the index object is freed so copy the
  table name to a safe place beforehand and use the copy.

  Fix Bug#36434 ha_innodb.so is installed in the wrong directory
  Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been
  forgotten in this commit: http://lists.mysql.com/commits/40206"
2008-05-14 10:45:32 +02:00
gkodinov/kgeorge@magare.gmz
92048588fe Merge bk-internal:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
2008-05-13 18:52:21 +03:00
gshchepa/uchum@host.loc
ba18c0bfd9 Fixed bug #36488: regexp returns false matches, concatenating
with previous rows.

The WHERE clause containing expression:
  CONCAT(empty_field1, empty_field2, ..., 'literal constant', ...)
    REGEXP 'regular expression'
may return wrong matches.

Optimization of the CONCAT function has been fixed.
2008-05-13 20:27:46 +05:00
gshchepa/uchum@host.loc
a11e058c74 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  host.loc:/work/bk/5.1-bugteam
2008-05-13 20:18:51 +05:00
gshchepa/uchum@host.loc
d558fcbd00 disabled.def:
max_heap_table_size_basic_32, query_cache_size_basic_32 and 
  tmp_table_size_basic_32 tests have been disabled according to
  bug #36522.
2008-05-13 20:17:59 +05:00
gkodinov/kgeorge@magare.gmz
f6951f3e9f Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take
subselects into account
  
It is forbidden to use the SELECT INTO construction inside UNION statements
unless on the last SELECT of the union. The parser records whether it 
has seen INTO or not when parsing a UNION statement. But if the INTO was
legally used in an outer query, an error is thrown if UNION is seen in a
subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
mitigate the error unless it collides with the UNION.
2008-05-13 18:10:46 +03:00
thek@adventure.(none)
d1547ffc58 Bug#32966 main.status fails
FLUSH STATUS doesn't clear the values of the global status variables.
The test case is reduced to testing session local Com-variables until
FLUSH GLOBAL STATUS is implemented.
2008-05-13 16:10:08 +02:00
thek@adventure.(none)
77d57aa3fd Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
2008-05-13 14:08:37 +02:00
thek@adventure.(none)
e836ec9d8d Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
Fixed build failure depending on events in embedded build.
2008-05-13 14:06:32 +02:00
gshchepa/uchum@host.loc
fc93a32ec9 Merge host.loc:/work/bugs/5.0-bugteam-36055
into  host.loc:/work/bk/5.1-bugteam
2008-05-13 00:37:45 +05:00
gshchepa/uchum@host.loc
486ef1bad6 Merge host.loc:/work/bugs/5.0-bugteam-36055
into  host.loc:/work/bk/5.0-bugteam
2008-05-13 00:32:43 +05:00
gshchepa/uchum@host.loc
1e7be565e2 Fixed bug #36055: mysql_upgrade doesn't really 'upgrade' tables
The REPAIR TABLE ... USE_FRM query silently corrupts data of tables
with old .FRM file version.
The mysql_upgrade client program or the REPAIR TABLE query (without
the USE_FRM clause) can't prevent this trouble, because in the
common case they don't upgrade .FRM file to compatible structure.

1. Evaluation of the REPAIR TABLE ... USE_FRM query has been
   modified to reject such tables with the message:
   "Failed repairing incompatible .FRM file".

2. REPAIR TABLE query (without USE_FRM clause) evaluation has been
   modified to upgrade .FRM files to current version.

3. CHECK TABLE ... FOR UPGRADE query evaluation has been modified
   to return error status when .FRM file has incompatible version.

4. mysql_upgrade and mysqlcheck client programs call CHECK TABLE
   FOR UPGRADE and REPAIR TABLE queries, so their behaviors have
   been changed too to upgrade .FRM files with incompatible
   version numbers.
2008-05-12 21:01:13 +05:00
gkodinov/kgeorge@magare.gmz
0844a628aa Fixed:
- a 64 bit compile warning in embedded
 - disabled the new (and failing tests for Bug#36522
2008-05-12 12:02:06 +03:00
tsmith@ramayana.hindu.god
5bdd04bffa Apply InnoDB snapshot innodb-5.1-ss2438.
Addresses the following bugs:

  Change the fix for Bug#32440 to show bytes instead of kilobytes in
  INFORMATION_SCHEMA.TABLES.DATA_FREE.

  branches/5.1: Fix bug#29507 TRUNCATE shows to many rows effected
  In InnoDB, the row count is only a rough estimate used by SQL
  optimization. InnoDB is now return row count 0 for TRUNCATE operation.

  branches/5.1: Fix bug#35537 - Innodb doesn't increment handler_update
  and handler_delete
  Add the calls to ha_statistic_increment() in ha_innobase::delete_row()
  and ha_innobase::update_row().

  Fix Bug#36169 create innodb compressed table with too large row size crashed
  Sometimes it is possible that
  row_drop_table_for_mysql(index->table_name, trx, FALSE); is invoked in
  row_create_index_for_mysql() when the index object is freed so copy the
  table name to a safe place beforehand and use the copy.

  Fix Bug#36434 ha_innodb.so is installed in the wrong directory
  Change pkglib_LTLIBRARIES with pkgplugin_LTLIBRARIES which has been
  forgotten in this commit: http://lists.mysql.com/commits/40206
2008-05-10 11:55:53 -06:00
hhunger@hh-nb.hungers
3b19417649 Merge hh-nb.hungers:/work/merge/mysql-5.1-bugteam
into  hh-nb.hungers:/work/merge/mysql-5.1-36522
2008-05-09 13:06:02 +02:00
thek@adventure.(none)
d796415142 Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
Enable previously disabled test cases which were tested against
the embedded build. The test cases are modified so that they require
non-embedded build.
2008-05-09 11:10:36 +02:00
thek@adventure.(none)
797b2b1135 Merge adventure.(none):/home/thek/Development/cpp/bug35997/my51-bug35997
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
2008-05-09 09:57:48 +02:00
thek@adventure.(none)
19a22f87e9 Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
The event scheduler was not designed to work in embedded mode. This
patch disables and excludes the event scheduler when the server is
compiled for embedded build.
2008-05-09 09:43:02 +02:00
hhunger@hh-nb.hungers
313e6c7757 Fixes for bug#36522. 2008-05-08 20:13:39 +02:00
mattiasj@client-10-129-10-147.upp.off.mysql.com
1eb8991a4e Merge client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/bug32575-50-bugteam
into  client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-50-bugteam
2008-05-08 11:26:20 +02:00
mattiasj@client-10-129-10-147.upp.off.mysql.com
bef6c14315 Bug#32575 - Parse error of stmt with extended comments on slave side
Problem was that mysql_create_view did not remove all comments characters
when writing to binlog, resulting in parse error of stmt on slave side.

Solution was to use the recreated select clause
and add a generated CHECK OPTION clause if needed.
2008-05-08 09:41:22 +02:00
davi@endora.local
8c7b197aa1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
2008-05-07 16:52:49 -03:00
sergefp@mysql.com
c21dbf27cf BUG#35850 "Performance regression in 5.1.23/5.1.24"
- Disable the "prefer full scan on clustered primary key over full scan
  of any secondary key" rule introduced by BUG#35850.
- Update test results accordingly 
(bk trigger: file this for BUG#35850)
2008-05-07 09:58:21 +04:00
davi@mysql.com/endora.local
e003471874 Re-enable test case thread_cache_size_func as Bug 35988
has been fixed and closed.
2008-05-06 23:37:55 -03:00
thek@adventure.(none)
c3ae054d50 Adjusted a filaing test and re-enabled it. 2008-05-06 16:17:23 +02:00
gkodinov/kgeorge@magare.gmz
51cdfd34fd Merge bk-internal:/home/bk/mysql-5.0
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
2008-05-05 15:04:26 +03:00
gkodinov/kgeorge@magare.gmz
6cc28909e9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
2008-05-01 17:51:26 +03:00
gkodinov/kgeorge@magare.gmz
c9428af688 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
2008-05-01 16:34:14 +03:00
gkodinov/kgeorge@magare.gmz
79a709bd60 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B35298-5.1-bugteam
2008-05-01 16:15:38 +03:00
gkodinov/kgeorge@magare.gmz
c00605c6cf Merge magare.gmz:/home/kgeorge/mysql/work/B35298-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/B35298-5.1-bugteam
2008-05-01 14:54:59 +03:00