• unknown's avatar
    Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree · 99b9f7a4
    unknown authored
    into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
    
    
    client/mysqldump.c:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/r/mysqldump.result:
      Auto merged
    mysql-test/r/rpl_ddl.result:
      Auto merged
    mysql-test/r/rpl_sp.result:
      Auto merged
    mysql-test/r/rpl_trigger.result:
      Auto merged
    mysql-test/r/sp-security.result:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    mysql-test/r/sql_mode.result:
      Auto merged
    mysql-test/t/rpl_trigger.test:
      Auto merged
    mysql-test/t/skip_grants.test:
      Auto merged
    mysql-test/t/sp-security.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_trigger.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    mysql-test/lib/mtr_cases.pl:
      Manually merged.
    sql/sp.cc:
      Manually merged.
    sql/sql_yacc.yy:
      Manually merged.
    99b9f7a4
sql_lex.h 37.2 KB