mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
62458 commits 2791 branches 343 tags 1.7 GiB
Commit graph

62458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marko Makela
36ad5f8a4c btr_cur_optimistic_insert(): Remove unused variable "heap". 2010-04-20 23:15:50 +03:00
Marko Makela
10c53c3913 dict_create_index_step(): Invoke dict_index_add_to_cache() 
in strict mode only if innodb_strict_mode is set. (Bug #50495)

trx_is_strict(): New function, for checking innodb_strict_mode.
 2010-04-20 14:42:22 +03:00
Marko Mäkelä
8b2f33f873 Implement UNIV_BTR_AVOID_COPY, an optimization of page splits. 2010-04-20 11:29:08 +03:00
Marko =?ISO-8859-1?Q?M=E4kel=E4?=
e67b5257a2 Enable UNIV_DEBUG_VALGRIND when HAVE_purify is set. 2010-04-19 13:36:03 +03:00
Marko =?ISO-8859-1?Q?M=E4kel=E4?=
5c6d38d781 Enable innodb_plugin tests based on the presence of lib_innodb_plugin. 2010-04-19 12:44:05 +03:00
Marko =?ISO-8859-1?Q?M=E4kel=E4?=
59137ec354 Do not require innodb for running innodb_plugin tests. 2010-04-19 12:21:13 +03:00
Marko Makela
3188a795ea 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
fcb5e10c5d Also send emails to innodb_dev_ww@oracle.com 2010-04-14 23:04:13 +03:00
Vasil Dimov
c8c003da81 Change the tree name to mysql-5.1-innodb in .bzr-mysql/default.conf 2010-04-14 23:02:47 +03:00
Vasil Dimov
73a25e4fa5 Fix path to have_innodb_plugin.inc 2010-04-12 17:26:20 +03:00
Vasil Dimov
668f2a89c3 Remove unused file 2010-04-12 17:23:00 +03:00
Vasil Dimov
02e1075fdf Fix path to innodb-index.inc 2010-04-12 16:58:47 +03:00
Vasil Dimov
ceaca681a6 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
Vasil Dimov
a633c45592 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
02c597e731 Fix mtr warning in innodb-autoinc-44030.test 2010-04-09 16:33:42 +03:00
Vasil Dimov
537b806cc8 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
edaca4bd50 Fix a mtr warning in innodb_plugin.innodb-autoinc 2010-04-09 16:25:17 +03:00
Vasil Dimov
67b9324860 Merge from innodb-branches-zip 2010-04-09 16:07:41 +03:00
Vasil Dimov
a995f3dd0a Merge from innodb-branches-zip 2010-04-09 16:05:29 +03:00
Vasil Dimov
164dedbad0 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
91600911d9 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
ed21e31ebc 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
bb4e5b5484 Merge from innodb-branches-zip 2010-04-07 22:42:25 +03:00
Vasil Dimov
ed4ab4fd16 Merge from SVN 2010-04-07 22:41:50 +03:00
Vasil Dimov
e351c94ab5 Merge from innodb-branches-zip 2010-04-07 22:00:06 +03:00
Vasil Dimov
a4588d748c Merge from innodb-branches-5.1 2010-04-07 21:59:02 +03:00
Vasil Dimov
ea028cddd2 Merge from SVN 2010-04-07 21:53:09 +03:00
Vasil Dimov
f3483f24e7 Merge from SVN 2010-04-07 21:52:37 +03:00
vdimov
55e4eb782b branches/zip: Whitespace fixup in univ.i 2010-04-07 18:40:38 +00:00
Vasil Dimov
8bfeb4d181 Repply changes to storage/innodb_plugin/plug.in that were made by MySQL 2010-04-07 21:33:36 +03:00
Vasil Dimov
ebb514f809 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
75b7e1b5a7 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
b844d6acaa Repply changes to storage/innodb_plugin/mysql-test/*.opt that were made by MySQL 2010-04-07 21:17:13 +03:00
Vasil Dimov
5ce66fdde6 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
793a8e95cb Repply changes to storage/innodb_plugin/Makefile.am that were made by MySQL 2010-04-07 20:24:43 +03:00
Vasil Dimov
3c2335be17 Reapply changes to storage/innodb_plugin/CMakeLists.txt that were made by MySQL 2010-04-07 20:21:15 +03:00
Vasil Dimov
c834fa0260 Import branches/zip@r6960 from SVN on top of storage/innodb_plugin 2010-04-07 19:53:14 +03:00
Vasil Dimov
46e5bbaa24 Merge from mysql-5.1-innodb 2010-04-07 15:43:25 +03:00
Vasil Dimov
2bfc788f7f Merge from mysql-5.1 2010-04-07 15:32:51 +03:00
Vasil Dimov
167b68fecb Move everything into a subdirectory xyz/ 2010-04-07 14:18:43 +03:00
mmakela
c2ecefe6e8 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
3124fbadbb 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
3f41e58cfb branches/zip: Whitespace fixup 2010-04-06 18:05:54 +00:00
vdimov
aff2d59043 Change the BZR property 2010-04-06 17:55:02 +00:00
vdimov
9af0bc75a7 Set some experimental properties 2010-04-06 17:48:35 +00:00
vdimov
750fc84b89 Set some experimental properties that could help with the merge into BZR. 2010-04-06 16:20:33 +00:00
vdimov
da0fe73f2d branches/5.1: 
Fix ./export.sh to honor ENDREV
 2010-04-06 16:18:25 +00:00
hery.ramilison@sun.com
e86bfa891d Raise version number after cloning 5.1.46 2010-04-06 15:57:33 +02:00
mmakela
a9b806e470 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
200366a123 merge 2010-04-06 10:56:11 +03:00