• unknown's avatar
    Merge mysql.com:/home/bkroot/mysql-5.1-new · 4e31551b
    unknown authored
    into  mysql.com:/home/bk/w3023-mysql-5.1-new
    
    
    configure.in:
      Auto merged
    BitKeeper/deleted/.del-sp_notembedded.test:
      Auto merged
    mysql-test/extra/binlog_tests/binlog.test:
      Auto merged
    mysql-test/extra/binlog_tests/blackhole.test:
      Auto merged
    mysql-test/r/binlog_stm_ctype_cp932.result:
      Auto merged
    mysql-test/t/sp.test:
      Auto merged
    scripts/mysql_fix_privilege_tables.sql:
      Auto merged
    sql/ha_ndbcluster_binlog.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/handler.h:
      Auto merged
    sql/log.h:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/opt_range.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    sql/table.h:
      Auto merged
    4e31551b
sql_base.cc 190 KB