• unknown's avatar
    Merge mysql.com:/home/ram/work/b19690/b19690.5.0 · dd1e0e7d
    unknown authored
    into  mysql.com:/home/ram/work/b19690/b19690.5.1
    
    
    mysql-test/r/type_float.result:
      Auto merged
    mysql-test/t/type_float.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/init.cc:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/field.h:
      merging
    sql/item_sum.cc:
      merging
    sql/sql_select.cc:
      merging
    dd1e0e7d
field.h 63.4 KB