• unknown's avatar
    Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 · 5bd9bf55
    unknown authored
    into  maint2.mysql.com:/data/localhome/tsmith/bk/50
    
    
    mysql-test/r/ctype_utf8.result:
      Auto merged
    mysql-test/t/ctype_utf8.test:
      Auto merged
    sql/net_serv.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    vio/viosocket.c:
      Auto merged
    client/mysql.cc:
      Manual merge.
    mysql-test/t/ctype_recoding.test:
      Manual merge.
    sql/sql_lex.h:
      SCCS merged
    sql/sql_table.cc:
      Manual merge.
    mysql-test/r/ctype_recoding.result:
      Manual merge
    5bd9bf55
sql_lex.h 36.9 KB