• unknown's avatar
    Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 8bdb243f
    unknown authored
    into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
    
    
    sql/mysql_priv.h:
      Auto merged
    mysql-test/r/symlink.result:
      manual merge
    mysql-test/t/symlink.test:
      manual merge
    sql/mysqld.cc:
      manual merge
    sql/sql_parse.cc:
      manual merge
    8bdb243f
mysql_priv.h 68.2 KB