diff options
author | unknown <tsmith@bk-internal.mysql.com> | 2007-07-19 17:44:35 +0200 |
---|---|---|
committer | unknown <tsmith@bk-internal.mysql.com> | 2007-07-19 17:44:35 +0200 |
commit | b7c5c9b814df298c870a3c0f1fada6eb58fa0d39 (patch) | |
tree | abc88c61e6e4a398660d6f473e560677de8b682f /sql/sql_update.cc | |
parent | 4c6262d4b6f2246baf858980741e3ec4c99cbc99 (diff) | |
parent | db2ccdea01c5a8dfd9651464b3a148a241203cb2 (diff) | |
download | mariadb-git-b7c5c9b814df298c870a3c0f1fada6eb58fa0d39.tar.gz |
Merge bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint
into bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.1-maint
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
0 files changed, 0 insertions, 0 deletions