• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 29fde528
    unknown authored
    into  mysql.com:/home/my/mysql-5.0
    
    
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/trigger.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/trigger.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/t/disabled.def:
      Manual merge
    sql/mysqld.cc:
      Manual merge
    sql/sp_head.cc:
      Manual merge
    sql/sql_trigger.cc:
      Manual merge
    29fde528
create.test 17.1 KB