• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-root · 40efb362
    unknown authored
    into  mysql.com:/media/sda1/mysql/mysql-5.0-merge
    
    
    mysql-test/r/select.result:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/r/ps.result:
      Manual merge (again).
    mysql-test/t/ps.test:
      Manual merge (again).
    mysql-test/t/select.test:
      Manual merge (again).
    sql/item_func.cc:
      Manual merge (again).
    sql/item_func.h:
      Manual merge (again).
    sql/set_var.h:
      Manual merge (again).
    40efb362
mysql_priv.h 57.4 KB