• unknown's avatar
    Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge · 146049d2
    unknown authored
    into  mysql.com:/home/gluh/MySQL/Merge/5.0
    
    
    include/mysql_com.h:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql-common/client.c:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    mysql-test/r/ctype_utf8.result:
      manual merge
    sql/sql_acl.cc:
      manual merge
    146049d2
sql_parse.cc 221 KB