• unknown's avatar
    Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 · 649f3d54
    unknown authored
    into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953
    
    
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/sp-error.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    mysql-test/r/sp-error.result:
      Manual merge.
    649f3d54
sql_view.cc 50.1 KB