database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
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
This commit is contained in:
unknown
2007-02-14 14:51:49 +01:00
parent 581db6c18a 555aed64aa
commit fe46b0ff6c
16 changed files with 133 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.h
View File

@ -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.
*/