• unknown's avatar
    Merge mysql.com:/home/hf/work/29878/my50-29878 · 8feaed2a
    unknown authored
    into  mysql.com:/home/hf/work/29878/my51-29878
    
    
    mysql-test/suite/rpl/r/rpl_session_var.result:
      Auto merged
    mysql-test/suite/rpl/t/rpl_session_var.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_strfunc.h:
      Auto merged
    8feaed2a
item.cc 187 KB