• unknown's avatar
    Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · b828f697
    unknown authored
    into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
    
    
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/innodb_mysql.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    mysql-test/include/mix1.inc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/mysqld.cc:
      Manual merge
    storage/myisam/sort.c:
      Manual merge
    b828f697
sql_class.h 69.8 KB