• Sergey Vojtovich's avatar
    MDEV-4786 - merge 10.0-monty → 10.0 · b2aea91f
    Sergey Vojtovich authored
    Fixed connect compilation failure.
    
    storage/connect/csort.cpp:
      min/max are not defined by my_global.h anymore, include osutil.h instead.
    storage/connect/filamfix.cpp:
      min/max are not defined by my_global.h anymore, include osutil.h instead.
    storage/connect/ha_connect.cc:
      Renamed MYSQL_ERROR -> Sql_condition.
      Renamed KEY::key_parts -> KEY::user_defined_key_parts.
      Adjusted connect according to:
      WL#4305 - storage-engine private data area per physical table.
    storage/connect/ha_connect.h:
      Adjusted connect according to:
      WL#4305 - storage-engine private data area per physical table.
    storage/connect/inihandl.c:
      min/max are not defined by my_global.h anymore, include osutil.h instead.
    storage/connect/osutil.h:
      min/max are not defined by my_global.h anymore, define them for C as well.
    storage/connect/taboccur.cpp:
      Include server headers before osutil.h to avoid min/max redefinition.
    storage/connect/tabpivot.cpp:
      Include server headers before osutil.h to avoid min/max redefinition.
    storage/connect/tabtbl.cpp:
      Include server headers before osutil.h to avoid min/max redefinition.
    storage/connect/tabxcl.cpp:
      Include server headers before osutil.h to avoid min/max redefinition.
    storage/connect/value.cpp:
      min/max are not defined by my_global.h anymore, include osutil.h instead.
      Include server headers before osutil.h to avoid min/max redefinition.
    b2aea91f
taboccur.cpp 19.3 KB