• unknown's avatar
    Merged 4.1 -> 5.0 · 6af82c07
    unknown authored
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/etc/logging_ok:
      auto-union
    myisam/mi_check.c:
      Auto merged
    myisam/myisamchk.c:
      Auto merged
    myisam/sort.c:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    6af82c07
errmsg.txt 17.3 KB