diff options
author | unknown <sergefp@mysql.com> | 2005-10-18 14:08:50 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2005-10-18 14:08:50 +0400 |
commit | 168942c194fc4a7cb87a240722ea56daf7c91d20 (patch) | |
tree | d6d7b767e37101864068ce6dc37173555bab7642 /sql/item.cc | |
parent | 387a29e33063b097ef6c22ed4b6dcb1d2672606f (diff) | |
parent | 7e3feca7b2b3b55449e1c87c62af53293d58aa4e (diff) | |
download | mariadb-git-168942c194fc4a7cb87a240722ea56daf7c91d20.tar.gz |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug12915-r2
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
0 files changed, 0 insertions, 0 deletions