Commit 3fee8832 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1.b13926

into  mysql.com:/usr/home/bar/mysql-5.0.b13926


sql/item_timefunc.cc:
  Auto merged
client/mysqldump.c:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
mysql-test/r/mysqldump.result:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
mysql-test/t/mysqldump.test:
  Empty merge of "backport of bug#13926 from 5.0 to 4.1"
parents 654395b0 248ab7c7
Loading
Loading
Loading
Loading

There are no changes