diff options
author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-04-13 09:07:46 +0300 |
---|---|---|
committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-04-13 09:07:46 +0300 |
commit | 830803a23b017530a76f176d635d83c1adc588e8 (patch) | |
tree | e1b7e490cac91f8dd9cc767b572ba4b6268946fe /sql/sql_db.cc | |
parent | f3efb3dcfac96afa487709f2603784f60f021f61 (diff) | |
parent | 2e73a53e033741b09a652646d9cfa0e76c33e6a1 (diff) | |
download | mariadb-git-830803a23b017530a76f176d635d83c1adc588e8.tar.gz |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
0 files changed, 0 insertions, 0 deletions