Commit graph

62545 commits

Author SHA1 Message Date
Marko Makela
6c354ffc51 storage/innodb_plugin: Relax too strict assertions about prefix
indexed BLOBs for ROW_FORMAT=DYNAMIC and ROW_FORMAT_COMPRESSED tables
(Bug #52746). In these tables, the locally stored prefix of a BLOB can
be as small as 20 bytes (BTR_EXTERN_FIELD_REF_SIZE). ROW_FORMAT=REDUNDANT
and ROW_FORMAT=COMPACT store a prefix of 768 bytes (REC_MAX_INDEX_COL_LEN).

trx_undo_rec_get_col_val(): Relax the ut_ad() assertion and add a
reference to dtuple_convert_big_rec().

trx_undo_rec_get_partial_row(): Relax the ut_a() assertion that
prompted Bug #52746.
2010-04-15 09:01:22 +02:00
Vasil Dimov
e61722f320 Also send emails to innodb_dev_ww@oracle.com 2010-04-14 23:04:13 +03:00
Vasil Dimov
73812d8558 Change the tree name to mysql-5.1-innodb in .bzr-mysql/default.conf 2010-04-14 23:02:47 +03:00
Vasil Dimov
9a7da960f8 Fix path to have_innodb_plugin.inc 2010-04-12 17:26:20 +03:00
Vasil Dimov
84c41ecbff Remove unused file 2010-04-12 17:23:00 +03:00
Vasil Dimov
0ee2f371f5 Fix path to innodb-index.inc 2010-04-12 16:58:47 +03:00
Vasil Dimov
f5692f21f9 Remove outdated InnoDB Plugin tests from mysql-test/suite/innodb,
the InnoDB Plugin tests are now in mysql-test/suite/innodb_plugin.

Move InnoDB tests to the innodb suite at mysql-test/suite/innodb.
2010-04-12 14:56:24 +03:00
unknown
edb8a7b2f8 Merge from mysql-5.1.43sp1-release 2010-04-12 12:12:20 +02:00
Vasil Dimov
666039be77 Convert InnoDB Plugin tests to include have_innodb_plugin.inc.
This also instructs mtr to transparently load the plugin.
2010-04-09 16:38:28 +03:00
Vasil Dimov
8b12f2cce9 Fix mtr warning in innodb-autoinc-44030.test 2010-04-09 16:33:42 +03:00
Vasil Dimov
be57311862 Fix a failure of innodb_plugin.innodb-autoinc-44030 now that
MySQL and InnoDB dictionaries do not get out of sync.
2010-04-09 16:29:13 +03:00
Vasil Dimov
70f40e39a1 Fix a mtr warning in innodb_plugin.innodb-autoinc 2010-04-09 16:25:17 +03:00
Vasil Dimov
65a401ec1f Merge from innodb-branches-zip 2010-04-09 16:07:41 +03:00
Vasil Dimov
492c8f81db Merge from innodb-branches-zip 2010-04-09 16:05:29 +03:00
Vasil Dimov
5a0e20715d Move the InnoDB Plugin tests from storage/innodb_plugin/mysql-test/ where
they are ignored to a new test suite "innodb_plugin".

Remove a hack in mtr that was deployed to run the builtin InnoDB tests against
the InnoDB Plugin. Also detect if a test is an 'innodb plugin test' and if so
then transparently replace the builtin InnoDB with the InnoDB Plugin.
2010-04-09 15:56:51 +03:00
Vasil Dimov
6e24349e98 Adjust mysql-test/suite/binlog/t/binlog_killed.test after a change
in behavior in InnoDB. The change in behavior was introduced by this
changeset:

  ------------------------------------------------------------
  revno: 3370
  revision-id: vasil.dimov@oracle.com-20100331130613-8ja7n0vh36a80457
  parent: vasil.dimov@oracle.com-20100331130440-l0y517y3mjsjqy4v
  parent: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  branch nick: mysql-5.1-innodb
  timestamp: Wed 2010-03-31 16:06:13 +0300
  message:
    Merge from innodb-branches-5.1
      ------------------------------------------------------------
      revno: 0.1.819
      revision-id: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c
      parent: vasil.dimov@oracle.com-20100331064722-9rc3wypzmer7d6jj
      parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918
      committer: Vasil Dimov <vasil.dimov@oracle.com>
      branch nick: innodb-branches-5.1
      timestamp: Wed 2010-03-31 14:31:19 +0300
      message:
        Merge from SVN
          ------------------------------------------------------------
          revno: 0.2.1
          revision-id: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918
          parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6912
          committer: mmakela
          timestamp: Wed 2010-03-31 07:14:51 +0000
          message:
            branches/5.1: Obey KILL during a lock wait (Bug #51920).
  
            srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
            Check trx_is_interrupted() in addition to checking the lock wait timeout.
  
            rb://279 approved by Sunny Bains
2010-04-08 19:55:55 +03:00
vdimov
c03341a0a6 branches/zip: Adjust the innodb test after change in behavior in MySQL
The change in behavior was introduced by this changeset:

  ------------------------------------------------------------
  revno: 3405
  revision-id: joro@sun.com-20100317141846-es0qyf5zcqb0hu1c
  parent: davi.arnaut@sun.com-20100309125156-z2c4uyqque49v61k
  committer: Georgi Kodinov <joro@sun.com>
  branch nick: B49838-5.1-bugteam
  timestamp: Wed 2010-03-17 16:18:46 +0200
  message:
    Bug #49838: DROP INDEX and ADD UNIQUE INDEX for same index may corrupt
       definition at engine
    
    If a single ALTER TABLE contains both DROP INDEX and ADD INDEX using 
    the same index name (a.k.a. index modification) we need to disable 
    in-place alter table because we can't ask the storage engine to have 
    two copies of the index with the same name even temporarily (if we 
    first do the ADD INDEX and then DROP INDEX) and we can't modify 
    indexes that are needed by e.g. foreign keys if we first do 
    DROP INDEX and then ADD INDEX.
    Fixed the problem by disabling in-place ALTER TABLE for these cases.
  modified:
    mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
    mysql-test/t/innodb_mysql.test sp1f-innodb_mysql.test-20060816102624-6ymo37d3nyhvbqyzqn5ohsfuydwo426k
    sql/sql_table.cc               sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
2010-04-08 14:05:17 +00:00
Vasil Dimov
9e451f11a1 Merge from innodb-branches-zip 2010-04-07 22:42:25 +03:00
Vasil Dimov
c611ba32e6 Merge from SVN 2010-04-07 22:41:50 +03:00
Vasil Dimov
7bacdb6a97 Merge from innodb-branches-zip 2010-04-07 22:00:06 +03:00
Vasil Dimov
3e7b21ca55 Merge from innodb-branches-5.1 2010-04-07 21:59:02 +03:00
Vasil Dimov
c0ce051d78 Merge from SVN 2010-04-07 21:53:09 +03:00
Vasil Dimov
b15553d742 Merge from SVN 2010-04-07 21:52:37 +03:00
vdimov
c7020fd5e7 branches/zip: Whitespace fixup in univ.i 2010-04-07 18:40:38 +00:00
Vasil Dimov
f4f1f0af3e Repply changes to storage/innodb_plugin/plug.in that were made by MySQL 2010-04-07 21:33:36 +03:00
Vasil Dimov
50dcbe69b4 Repply changes to storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt that were made by MySQL 2010-04-07 21:30:44 +03:00
csun
5b35bb91a0 branches/zip: fix compiler errors on Windows.
Move ut_ad() to after declarations for C file.
2010-04-07 18:24:55 +00:00
Vasil Dimov
18420c70de Repply changes to storage/innodb_plugin/mysql-test/*.opt that were made by MySQL 2010-04-07 21:17:13 +03:00
Vasil Dimov
41e5a2fb78 Repply changes to storage/innodb_plugin/handler/ha_innodb.cc that were made by MySQL 2010-04-07 20:44:47 +03:00
Vasil Dimov
f30e7a4c4a Repply changes to storage/innodb_plugin/Makefile.am that were made by MySQL 2010-04-07 20:24:43 +03:00
Vasil Dimov
e436d25b7f Reapply changes to storage/innodb_plugin/CMakeLists.txt that were made by MySQL 2010-04-07 20:21:15 +03:00
Vasil Dimov
9a6d13afed Import branches/zip@r6960 from SVN on top of storage/innodb_plugin 2010-04-07 19:53:14 +03:00
Vasil Dimov
4798cb0754 Merge from mysql-5.1-innodb 2010-04-07 15:43:25 +03:00
Vasil Dimov
10cff88638 Merge from mysql-5.1 2010-04-07 15:32:51 +03:00
Vasil Dimov
d587bd4b15 Move everything into a subdirectory xyz/ 2010-04-07 14:18:43 +03:00
mmakela
445c88474b branches/zip: innobase_init(): Correct the error message
about wrong innodb_change_buffering value.  Reported by Ranger.
2010-04-07 11:03:54 +00:00
mmakela
01f991351c branches/zip: buf_flush_block_cmp(): Do not mix declarations and code.
Stick to C90, because some build platforms are not C99 yet.
2010-04-07 06:21:26 +00:00
vdimov
0499a0e1eb branches/zip: Whitespace fixup 2010-04-06 18:05:54 +00:00
vdimov
fa9a1bd5ea Change the BZR property 2010-04-06 17:55:02 +00:00
vdimov
7bc95409dc Set some experimental properties 2010-04-06 17:48:35 +00:00
vdimov
bc553eefb5 Set some experimental properties that could help with the merge into BZR. 2010-04-06 16:20:33 +00:00
vdimov
1199a0e5fb branches/5.1:
Fix ./export.sh to honor ENDREV
2010-04-06 16:18:25 +00:00
unknown
7357c325b9 Raise version number after cloning 5.1.46 2010-04-06 15:57:33 +02:00
mmakela
72d602070a branches/zip: Add debug checks to track down Issue #461.
dict_table_check_for_dup_indexes(): Add the flag tmp_ok.  If !tmp_ok,
check that no index name starts with TEMP_INDEX_PREFIX.

ha_innobase::add_index(), ha_innobase::prepare_drop_index(),
ha_innobase::final_drop_index(): Call dict_table_check_for_dup_indexes().
2010-04-06 12:11:46 +00:00
Georgi Kodinov
031d698c58 changed the version back 2010-04-06 10:58:45 +03:00
Georgi Kodinov
c9cfd2df5f merge 2010-04-06 10:56:11 +03:00
Georgi Kodinov
e1dbabba15 merge 2010-04-06 10:51:52 +03:00
mmakela
72a38104ea branches/zip: trx0sys.ic: Correct a typo in a comment. 2010-04-06 06:14:51 +00:00
Sergey Glukhov
c1ad5072b8 Bug#52336 Segfault / crash in 5.1 copy_fields (param=0x9872980) at sql_select.cc:15355
The problem is that we can not use make_cond_for_table().
This function relies on used_tables() condition
which is not set properly for subqueries.
As result subquery is not filtered out.
The fix is to use remove_eq_conds() function instead
of make_cond_for_table() func. 'remove_eq_conds()'
algorithm relies on const_item() value and it allows
to handle subqueries in right way.


mysql-test/r/having.result:
  test case
mysql-test/t/having.test:
  test case
sql/sql_select.cc:
  The fix is to use remove_eq_conds() function instead
  of make_cond_for_table() function.
2010-04-05 16:10:26 +05:00
Gleb Shchepa
e2a546aef4 Bug #40625: Concat fails on DOUBLE values in a Stored
Procedure, while DECIMAL works

Selecting of the CONCAT(...<SP variable>...) result into
a user variable may return wrong data.


Item_func_concat::val_str contains a number of memory
allocation-saving tricks. One of them concatenates
strings inplace inserting the value of one string
at the beginning of the other string. However,
this trick didn't care about strings those points
to the same data buffer: this is possible when
a CONCAT() parameter is a stored procedure variable -
Item_sp_variable::val_str() uses the intermediate
Item_sp_variable::str_value field, where it may
store a reference to an external buffer.


The Item_func_concat::val_str function has been
modified to take into account val_str functions
(such as Item_sp_variable::val_str) that return
a pointer to an internal Item member variable
that may reference to a buffer provided.


mysql-test/r/func_concat.result:
  Test case for the bug #40625.
mysql-test/t/func_concat.test:
  Test case for the bug #40625.
sql/item_strfunc.cc:
  Bug #40625: Concat fails on DOUBLE values in a Stored
              Procedure, while DECIMAL works
  
  The Item_func_concat::val_str function has been
  modified to take into account val_str functions
  (such as Item_sp_variable::val_str) that return
  a pointer to an internal Item member variable
  that may reference to a buffer provided.
2010-04-03 00:30:22 +04:00