• unknown's avatar
    Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · 93ba6ddc
    unknown authored
    into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
    
    
    mysql-test/r/user_var.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/user_var.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    sql/table.h:
      Auto merged
    mysql-test/t/view.test:
      Merge with 5.0-opt.
    93ba6ddc
user_var.result 8.66 KB