Commit 750dd5ed authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge 

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents cacaef6e 5aa8705a

There are no changes