diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-27 17:19:51 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-11-27 17:19:51 +0200 |
| commit | 9d503cea20bc5f2e1569f16b0114d34dfd875d66 (patch) | |
| tree | a3c420386343c1c165e1543cfd9788b34d0cb9bd /sql/slave.cc | |
| parent | 3058e0257315eeb183a1df10376cd9f4df3061fb (diff) | |
| parent | 63b65169534c97f0c225859d2d6d49f3cee2bc10 (diff) | |
| download | mariadb-git-9d503cea20bc5f2e1569f16b0114d34dfd875d66.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt
include/mysql_com.h:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/udf_example.c:
Auto merged
Diffstat (limited to 'sql/slave.cc')
0 files changed, 0 insertions, 0 deletions