• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a11b5ee7
    unknown authored
    into  mishka.local:/home/my/mysql-5.0
    
    
    mysql-test/t/sp.test:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    client/client_priv.h:
      Simple merge
    client/mysqldump.c:
      Simple merge
    mysql-test/r/variables.result:
      Simple merge
    mysql-test/t/variables.test:
      Simple merge
    sql/sql_trigger.cc:
      Simple merge
    a11b5ee7
sql_view.cc 36.5 KB