• unknown's avatar
    Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 5f10ffd0
    unknown authored
    into  mysql.com:/home/gluh/MySQL/Merge/5.1
    
    
    include/mysql_com.h:
      Auto merged
    mysql-test/r/ctype_utf8.result:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/r/query_cache.result:
      Auto merged
    mysql-test/r/type_date.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    mysql-test/t/func_time.test:
      Auto merged
    mysql-test/t/view.test:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/slave.h:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql-common/client.c:
      Auto merged
    sql/sql_repl.h:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/sp.cc:
      manual merge
    sql/sp_head.cc:
      manual merge
    sql/sql_class.h:
      manual merge
    sql/table.cc:
      manual merge
    5f10ffd0
mysql_com.h 16.8 KB