diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-14 14:51:49 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-14 14:51:49 +0100 |
| commit | fe46b0ff6c862862efa5ad990f4941c03a25640e (patch) | |
| tree | 8f6f0bf8705654adfef1b27bf5997db33482b106 /sql/sql_class.h | |
| parent | 581db6c18a7a7e566b489509cde5d7d0533f1d3f (diff) | |
| parent | 555aed64aa38475f424a3620b79a3b5e9d0ddb67 (diff) | |
| download | mariadb-git-fe46b0ff6c862862efa5ad990f4941c03a25640e.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/mysqld.cc:
Manual merge of OPT_SECUREE_FILE_PRIV
sql/set_var.cc:
Manual merge
sql/share/errmsg.txt:
Manual merge, change is already in 5.1
sql/sql_class.h:
Manual mergem change is already in 5.1
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 7babe1eda24..727cff0c463 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1640,7 +1640,7 @@ public: /* - Used to hold information about file and file structure in exchainge + Used to hold information about file and file structure in exchange via non-DB file (...INTO OUTFILE..., ...LOAD DATA...) XXX: We never call destructor for objects of this class. */ |