• unknown's avatar
    Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 · 46f25b3b
    unknown authored
    into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
    
    
    sql/item_timefunc.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    BitKeeper/deleted/.del-mysql_client.result:
      manual merge
    BitKeeper/deleted/.del-mysql_client.test:
      manual merge
    mysql-test/r/func_time.result:
      manual merge
    mysql-test/t/func_time.test:
      manual merge
    sql/sql_acl.cc:
      manual merge
    46f25b3b
item_timefunc.cc 84.1 KB