diff options
author | unknown <gshchepa/uchum@gleb.loc> | 2007-06-18 18:45:55 +0500 |
---|---|---|
committer | unknown <gshchepa/uchum@gleb.loc> | 2007-06-18 18:45:55 +0500 |
commit | ccae0cf8b203e1e36b0f8b526ef21ee545ea8bac (patch) | |
tree | 6f5222a9cf0cb66384b1b87f5679f9c17b403c80 /sql/net_serv.cc | |
parent | 4831826c694d5169764eb75fb246c0cb6f0f7a99 (diff) | |
parent | 6e315bfae2fdd147c901647bb28ed09359aa0add (diff) | |
download | mariadb-git-ccae0cf8b203e1e36b0f8b526ef21ee545ea8bac.tar.gz |
Merge gleb.loc:/home/uchum/work/bk/5.0
into gleb.loc:/home/uchum/work/bk/5.0-opt
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/net_serv.cc')
0 files changed, 0 insertions, 0 deletions