• unknown's avatar
    Merge mysql.com:/home/ram/work/b26359/b26359.5.0 · b31495dd
    unknown authored
    into  mysql.com:/home/ram/work/b26359/b26359.5.1
    
    
    mysql-test/r/strict.result:
      Auto merged
    mysql-test/t/strict.test:
      Auto merged
    mysql-test/r/type_date.result:
      merging
    sql/field.cc:
      merging
    sql/field.h:
      merging
    b31495dd
field.cc 256 KB