Commit graph

54273 commits

Author SHA1 Message Date
tnurnberg@noir.wlan.koehntopp.de
cd84cb3711 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  noir.wlan.koehntopp.de:/misc/mysql/3/51-3
2008-05-14 11:13:12 +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
pcrews@pcrews-mac-local.local
63a5bceb52 Bug#35744 - Test 'partition_alter1_innodb' times out on multiple platforms.
Split the test into 3 smaller parts, reducing single test run time.

NDB variant still disabled. The runtime for a single test is greater than the runtime
for the Innodb variant that was timing out.  The test works, but disabled for Build systems.
2008-05-13 19:10:52 -04: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
gshchepa/uchum@host.loc
76f01654b8 mix2_myisam.result:
Post-push test case update (bug #30059).
2008-05-13 19:14:49 +05: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
kent@kent-amd64.(none)
fc30f6d5b4 Merge mysql.com:/home/kent/bk/mysql-5.0-release-merge
into  mysql.com:/home/kent/bk/mysql-5.1
2008-05-13 15:56:07 +02:00
kent@kent-amd64.(none)
c643e677fc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.0-release-merge
2008-05-13 15:46:38 +02:00
gkodinov/kgeorge@magare.gmz
e6b8470d56 Merge bk-internal:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/win64-warn-5.1-bugteam
2008-05-13 15:29:35 +03:00
gkodinov/kgeorge@magare.gmz
9eac77bc8b fixed the win64 build failure 2008-05-13 15:29:08 +03:00
gshchepa/uchum@host.loc
c206873bd3 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  host.loc:/work/bk/5.1-bugteam
2008-05-13 17:12:04 +05:00
gshchepa/uchum@host.loc
2c3b9c2e8c Merge host.loc:/work/bk/5.0-bugteam
into  host.loc:/work/bk/5.1-bugteam
2008-05-13 17:09:28 +05: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
ebc6e02dee Merge host.loc:/work/bugs/5.0-bugteam-30059
into  host.loc:/work/bk/5.1-bugteam
2008-05-13 17:01:02 +05:00
gshchepa/uchum@host.loc
29a755fee1 Merge host.loc:/work/bugs/5.0-bugteam-30059
into  host.loc:/work/bk/5.0-bugteam
2008-05-13 16:59:44 +05:00
gshchepa/uchum@host.loc
45e796d5b9 Merge host.loc:/work/bk/5.0-bugteam
into  host.loc:/work/bk/5.1-bugteam
2008-05-13 00:38:17 +05: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
mats@mats-laptop.(none)
2a1dda44c3 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bug36197
into  mats-laptop.(none):/home/bk/b36197-mysql-5.1-bugteam
2008-05-12 20:01:10 +02:00
mats@mats-laptop.(none)
812fa8b24c BUG#36197: flush tables (or little table cache) can cause crash on slave
When flushing tables, there were a slight chance that the flush was occuring
between processing of two table map events. Since the tables are opened
one by one, it might result in that the tables were not valid and that sub-
sequent locking of tables would cause the slave to crash.

The problem is solved by opening and locking all tables at once using
simple_open_n_lock_tables(). Also, the patch contain a change to open_tables()
so that pre-locking only takes place when the trg_event_map is not zero, which
was not the case before (this caused the lock to be placed in thd->locked_tables
instead of thd->lock since the assumption was that triggers would be called
later and therefore the tables should be pre-locked).
2008-05-12 19:50:53 +02:00
gkodinov/kgeorge@magare.gmz
cc2a217314 Merge bk-internal:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/fixes-5.1-bugteam
2008-05-12 19:35:08 +03:00
gkodinov/kgeorge@magare.gmz
f1ad66e6c0 fixed the win32 make files to compile the fix for bug 35997 2008-05-12 19:34:25 +03: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
thek@adventure.(none)
459a35cce1 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-12 12:10:57 +02:00
thek@adventure.(none)
d8e2b87150 Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
SHOW commands fail in embedded mode because schema_table array doesn't
correspond to enum_schema_tables.

This patch implements a dummy implementation of the abstract fill_table
function to be used when the event scheduler (or other core feature)
isn't part of the build.
2008-05-12 12:09:10 +02: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
msvensson@pilot.(none)
914e85b3f8 BUG#35543 mysqlbinlog.cc does not properly work with tmp files
- Backport to 5.0, use --local-load to instruct myqlbinlog where to 
 put the files it generate
2008-05-09 15:17:10 +02: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)
92724ecb3d Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
Missing file: include/is_embedded.inc

This file was left out of the initial changeset by misstake.
2008-05-09 10:26:06 +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
tsmith@ramayana.hindu.god
6265518976 Bug #34297: MySQL Server crashes when processing large table
Remove optimizations on innobase/mem/* to avoid apparent compiler bug which
causes memory overruns.  See also bug 19424, and probably bug 36366.

This is done in 5.1+; 5.0 already has this workaround in place.
2008-05-09 00:38:17 -06: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
46375759a2 Bug#32575: Parse error of stmt with extended comments on slave side
test change for 5.1+ (show create view adds two columns in 5.1)

Patch only for 5.1+
2008-05-08 14:02:09 +02:00
mattiasj@client-10-129-10-147.upp.off.mysql.com
5a340eeaec Merge client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-50-bugteam
into  client-10-129-10-147.upp.off.mysql.com:/Users/mattiasj/clones/topush-51-bugteam
2008-05-08 13:45:40 +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
sven@riska.(none)
0c2a0e8095 Merge riska.(none):/home/sven/bk/b36379-enable_test/gca
into  riska.(none):/home/sven/bkroot/5.1-bugteam
2008-05-07 20:17:37 +02:00
sven@riska.(none)
cf7c15fee8 BUG#36398: 'DROP TEMPORARY TABLE' in ROLLBACK transaction causes transaction to be logged
Temporarily checking in an incorrect test case. Rationale: the impact of
this bug is negligible (it's almost a feature request). We need 5.1 to be
stable, and making a real fix is a bit risky. So the fix is postponed
to 6.0.
2008-05-07 13:02:06 +02:00
sven@riska.(none)
9565c7adc9 BUG#36379: please re-enable rpl_innodb_bug28430
The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
it. The test and result file needed to be updated too.
2008-05-07 12:57:07 +02: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