Skip to content

M
MariaDB
Switch branch/tag
  1. 14 Mar, 2007 12 commits
  3. 13 Mar, 2007 9 commits
    • unknown's avatar
      Removed tabs. · 8205e16c
      unknown authored
      8205e16c
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines · 6095508b
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
      6095508b
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines · 968d1695
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines


myisam/mi_create.c:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/sql_parse.cc:
  Use local.
mysql-test/r/merge.result:
  SCCS merged
      968d1695
    • unknown's avatar
      BUG#26881 - Large MERGE tables report incorrect specification when no · 969b7165
      unknown authored 
                  differences in tables
Certain merge tables were wrongly reported as having incorrect definition:
- Some fields that are 1 byte long (e.g. TINYINT, CHAR(1)), might
  be internally casted (in certain cases) to a different type on a
  storage engine layer. (affects 4.1 and up)
- If tables in a merge (and a MERGE table itself) had short VARCHAR column (less
  than 4 bytes) and at least one (but not all) tables were ALTER'ed (even to an
  identical table: ALTER TABLE xxx ENGINE=yyy), table definitions went ouf of
  sync. (affects 4.1 only)

This is fixed by relaxing a check for underlying conformance and setting
field type to FIELD_TYPE_STRING in case varchar is shorter than 4
when a table is created.


myisam/mi_create.c:
  Added a comment.
mysql-test/r/merge.result:
  A test case for bug#26881.
mysql-test/t/merge.test:
  A test case for bug#26881.
sql/ha_myisam.cc:
  Relaxed some checks performed by check_definition():
  As comparing of fulltext keys (and key segments) is not yet implemented,
  only return an error in case one of keys is fulltext and other is not.
  Otherwise, if both keys are fulltext, accept them as is.
  
  As comparing of spatial keys (and key segments) is not yet implemented,
  only return an error in case one of keys is spatial and other is not.
  Otherwise, if both keys are spatial, accept them as is.
  
  A workaround to handle situation when field is casted from FIELD_SKIP_ZERO
  to FIELD_NORMAL. This could happen only in case field length is 1 and row
  format is fixed.
sql/sql_parse.cc:
  When a table that has varchar field shorter than 4 is created, field type is
  set to FIELD_TYPE_VAR_STRING. Later, when a table is modified using alter
  table, field type is changed to FIELD_TYPE_STRING (see Field_string::type).
  That means HA_OPTION_PACK_RECORD flag might be lost and thus null_bit might
  be shifted by alter table, in other words alter table doesn't create 100%
  equal table definition.
  
  This is usually not a problem, since when a table is created/altered,
  definition on a storage engine layer is based on one that is passed from
  sql layer. But it is a problem for merge engine - null_bit is shifted when
  a table (merge or underlying) is altered.
  
  Set field type to FIELD_TYPE_STRING in case FIELD_TYPE_VAR_STRING is shorter
  than 4 when a table is created as it is done in Field::type.
      969b7165
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines · 4f20ff2f
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines


sql/field.h:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
      4f20ff2f
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 36a27948
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.1-engines


storage/myisam/mi_open.c:
  Use local.
      36a27948
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines · 063c95e6
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines
      063c95e6
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · d496ab15
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-5.0-engines


myisam/rt_index.c:
  Auto merged
sql/field.h:
  Auto merged
      d496ab15
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · e266365c
      unknown authored 
      into  mysql.com:/home/svoj/devel/mysql/BUG26881/mysql-4.1-engines
      e266365c
  5. 12 Mar, 2007 17 commits
  7. 10 Mar, 2007 2 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a140cb7
      unknown authored 
      into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt


mysql-test/r/explain.result:
  Auto merged
mysql-test/r/func_default.result:
  Auto merged
mysql-test/r/func_regexp.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/varbinary.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
mysql-test/r/func_str.result:
  Manually merged
mysql-test/t/func_str.test:
  Manually merged
      8a140cb7
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/15757-bug-5.0-opt-mysql · 2f774b47
      unknown authored 
      into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql


sql/item_strfunc.cc:
  Auto merged
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  SCCS merged
      2f774b47
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7