diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2007-01-24 15:57:58 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2007-01-24 15:57:58 +0200 |
| commit | 19ce865686ec43780d14ca43aa0d516bf5b36c8b (patch) | |
| tree | 80a093df55326d5ec96eb0d99798926874909a90 /mysql-test/r/udf.result | |
| parent | 6098f770787edc75992e0b9a96081dd77e4f89aa (diff) | |
| parent | f469aa0093f2a99f0359c939801efc0e51f8e2d5 (diff) | |
| download | mariadb-git-19ce865686ec43780d14ca43aa0d516bf5b36c8b.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-opt
into macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/udf.result')
0 files changed, 0 insertions, 0 deletions