• unknown's avatar
    Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · c45171b0
    unknown authored
    into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
    
    
    mysql-test/r/ctype_utf8.result:
      Auto merged
    mysql-test/r/func_regexp.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    mysql-test/t/func_regexp.test:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    mysql-test/r/ctype_ucs.result:
      After merge fix
    mysql-test/t/ctype_ucs.test:
      After merge fix
    c45171b0
func_regexp.result 3.57 KB