diff options
author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 10:21:13 +0100 |
---|---|---|
committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 10:21:13 +0100 |
commit | b51cf266293929dec21e41bdc97c4eead4884f0e (patch) | |
tree | c5d1f873f4d250f55b1a05e56f971e6cb9010d06 /mysql-test/r/udf.result | |
parent | 95b72158698f8b0ea0be7e9846a6e7fa1b9cc680 (diff) | |
parent | fe99bda872fd51b07e1ebb0dc506e26d195edec7 (diff) | |
download | mariadb-git-b51cf266293929dec21e41bdc97c4eead4884f0e.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/udf.result')
0 files changed, 0 insertions, 0 deletions