• unknown's avatar
    Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 6e07c2e6
    unknown authored
    into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
    
    
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/r/sp-vars.result:
      merging
    mysql-test/r/type_datetime.result:
      SCCS merged
    mysql-test/t/type_datetime.test:
      SCCS merged
    sql/item_func.h:
      merging
    sql/mysql_priv.h:
      merging
    6e07c2e6
item_func.cc 134 KB