diff options
author | unknown <gkodinov/kgeorge@rakia.gmz> | 2007-02-01 10:59:14 +0200 |
---|---|---|
committer | unknown <gkodinov/kgeorge@rakia.gmz> | 2007-02-01 10:59:14 +0200 |
commit | 4ebef0520629873253ed5007aba1a01c91d7f8fd (patch) | |
tree | 6e27c3ed623225178cd1893ca555b4f7e519601c /mysql-test/t/func_time.test | |
parent | 036314d917fc149f529724332d80a74f95ab959a (diff) | |
parent | cab412666eba39347410f1369e56ace47938a76d (diff) | |
download | mariadb-git-4ebef0520629873253ed5007aba1a01c91d7f8fd.tar.gz |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
mysql-test/r/grant.result:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/func_time.test')
0 files changed, 0 insertions, 0 deletions