summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <gshchepa/uchum@gleb.loc>2007-07-22 00:53:01 +0500
committerunknown <gshchepa/uchum@gleb.loc>2007-07-22 00:53:01 +0500
commit5ad952567233e9b9b8d9a4047f2be16dc8fee171 (patch)
tree48bba9f11f2e064c1f6b490615a42c73c90ef931 /libmysql
parentf303c0c87f8a1bd9c90dc74e6ee35c7553dc6552 (diff)
parentaed9a5fee33affcf1dc2cd6355605438296aa903 (diff)
downloadmariadb-git-5ad952567233e9b9b8d9a4047f2be16dc8fee171.tar.gz
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt sql/item_func.h: Auto merged mysql-test/r/sp.result: Merge with 5.0-opt. mysql-test/t/sp.test: Merge with 5.0-opt. sql/item_func.cc: Merge with 5.0-opt.
Diffstat (limited to 'libmysql')
0 files changed, 0 insertions, 0 deletions