• unknown's avatar
    Merge from 4.1 to 5.0 · 6d5dd516
    unknown authored
    
    client/mysql.cc:
      Auto merged
    include/my_pthread.h:
      Auto merged
    ndb/src/ndbapi/ndberror.c:
      Auto merged
    sql/examples/ha_archive.cc:
      Auto merged
    sql/examples/ha_archive.h:
      Auto merged
    BUILD/SETUP.sh:
      Manual merge of conflicts
      -DBIG_TABLES removed set by configure using --with-big-tables
    configure.in:
      manual merge
    mysql-test/r/archive.result:
      Manual merge
    mysql-test/t/archive.test:
      Manual merge
    6d5dd516
my_pthread.h 24 KB