• unknown's avatar
    Merge bk@192.168.21.1:mysql-5.0 · 12af6585
    unknown authored
    into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt
    
    
    mysql-test/r/order_by.result:
      Auto merged
    mysql-test/r/subselect.result:
      Auto merged
    mysql-test/t/order_by.test:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    mysql-test/r/func_str.result:
      merging
    mysql-test/r/sp.result:
      merging
    mysql-test/r/view.result:
      merging
    mysql-test/t/func_str.test:
      merging
    mysql-test/t/view.test:
      merging
    12af6585
sp.test 144 KB