diff options
author | unknown <igor@rurik.mysql.com> | 2004-08-20 16:32:40 -0700 |
---|---|---|
committer | unknown <igor@rurik.mysql.com> | 2004-08-20 16:32:40 -0700 |
commit | 7c46252467101d841de5b7774b4f5b6ddf858d9f (patch) | |
tree | f06700cf3a42691a32a4aaadb4f2b67f2f9872a6 /sql-common | |
parent | 6bccd36664c09c094bf3281ccdeaf7e8b249f8ef (diff) | |
parent | 282ec5bd28ba5739f1fe5754e9031646138f3acf (diff) | |
download | mariadb-git-7c46252467101d841de5b7774b4f5b6ddf858d9f.tar.gz |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql-common')
0 files changed, 0 insertions, 0 deletions