• unknown's avatar
    Merge mysql.com:/usr/home/bar/mysql-4.1.b22645 · f0b4cad3
    unknown authored
    into  mysql.com:/usr/home/bar/mysql-5.0.b22645
    
    
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/log.cc:
      Removing one_shot from 5.0.
    sql/sql_locale.cc:
      After merge fix
    sql/set_var.cc:
      After merge fix
    sql/set_var.h:
      After merge fix
    f0b4cad3
mysql_priv.h 64.6 KB