• unknown's avatar
    Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) · 9314a207
    unknown authored
    This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
    
    
    BitKeeper/etc/ignore:
      added libmysqld/sql_plugin.cc
    include/Makefile.am:
      Added plugin.hd
    include/m_ctype.h:
      Added my_strchr
    include/my_base.h:
      Added HA_USES_PARSER
      Merge with old 5.1 tree
    libmysqld/Makefile.am:
      Added sql_plugin.cc
    mysql-test/r/ndb_gis.result:
      Fixed results after merge
    sql/Makefile.am:
      Addes sql_plugin.h and sql_plugin.cc
    sql/ha_heap.h:
      Indentation fix
    sql/ha_partition.cc:
      Made partition_hton visible outside
      After merge fixes (for call to get_new_handler)
    sql/handler.cc:
      Added partition_hton to handlerton
    sql/handler.h:
      Added partion to handlerton
      Updated mysql_unpack_partion() from old 5.1 tree
    sql/mysql_priv.h:
      Added sql_plugin.h
    sql/records.cc:
      After merge fix
    sql/share/errmsg.txt:
      Added new errors messages from old 5.1 tree
    sql/sql_partition.cc:
      Removed compiler warnings
      Updated mysql_unpack_partition() from latest 5.1 tree
    sql/structs.h:
      Update KEY from latest 5.1 tree (to get table.cc to compile)
    sql/table.cc:
      Merged .frm format from 5.0, new 5.1 and old 5.1 tree
      (We now use same format as the old 5.1 tree)
      Note that this patch includes code for HA_USE_PARSER which is not usable until rest of 5.1 tree is restored
    sql/unireg.cc:
      Merged .frm format from 5.0, new 5.1 and old 5.1 tree
      (We now use same format as the old 5.1 tree)
      Note that this patch includes code for HA_USE_PARSER which is not usable until rest of 5.1 tree is restored
    strings/Makefile.am:
      Added my_strchr.c
    include/plugin.h:
      New BitKeeper file ``include/plugin.h''
    sql/sql_plugin.cc:
      New BitKeeper file ``sql/sql_plugin.cc''
    sql/sql_plugin.h:
      New BitKeeper file ``sql/sql_plugin.h''
    strings/my_strchr.c:
      New BitKeeper file ``strings/my_strchr.c''
    9314a207
unireg.cc 25 KB