Commit 672e42ca authored Mar 16, 2002 by bell@sanja.is.com.ua

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4

into sanja.is.com.ua:/home/bell/mysql/work.etalon

parents b642599f c92df13c

sql/sql_class.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -492,7 +492,10 @@ class THD :public ilink {
		CHANGED_TABLE_LIST * changed_table_dup(TABLE *table);
		};


		/*
		Used to hold information about file and file structure in exchainge
		via non-DB file (...INTO OUTFILE..., ...LOAD DATA...)
		*/
		class sql_exchange :public Sql_alloc
		{
		public:

sql/table.h

+4 −3

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ struct st_table {
		char table_name,real_name,*path;
		uint key_length; /* Length of key */
		uint tablenr,used_fields,null_bytes;
		table_map map;
		table_map map; /* ID bit of table (1,2,4,8,16...) */
		ulong version,flush_version;
		uchar *null_flags;
		IO_CACHE io_cache; / If sorted trough file*/
		@@ -141,6 +141,7 @@ typedef struct st_table_list {
		uint32 db_length, real_name_length;
		Item on_expr; / Used with outer join */
		struct st_table_list natural_join; / natural join on this table*/
		/* ... join ... USE INDEX ... IGNORE INDEX */
		List<String> use_index,ignore_index;
		TABLE *table;
		GRANT_INFO grant;