diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-14 14:45:15 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-14 14:45:15 +0100 |
| commit | 555aed64aa38475f424a3620b79a3b5e9d0ddb67 (patch) | |
| tree | d9ed3a93c532522c244c012360f4d33a5f907e17 /sql/sql_class.h | |
| parent | 12d6c6eb18320e3c22e1844b7df993523a160110 (diff) | |
| parent | c4ae01e6f0e9055f0e541aa42a653c6ab0e24b7b (diff) | |
| download | mariadb-git-555aed64aa38475f424a3620b79a3b5e9d0ddb67.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
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 05034ebd573..1fe5ef54043 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1674,7 +1674,7 @@ public: #define SYSTEM_THREAD_SLAVE_SQL 4 /* - 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. */ |