database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

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


sql/sql_class.h:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2002-03-16 10:38:35 +02:00
parent dad9a12b3d 5c6902a495
commit e8cc84628b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -492,7 +492,10 @@ public:
CHANGED_TABLE_LIST * changed_table_dup(TABLE *table); 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 class sql_exchange :public Sql_alloc
{ {
public: public:

3
sql/table.h
View File

@ -112,7 +112,7 @@ struct st_table {
char *table_name,*real_name,*path; char *table_name,*real_name,*path;
uint key_length; /* Length of key */ uint key_length; /* Length of key */
uint tablenr,used_fields,null_bytes; 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; ulong version,flush_version;
uchar *null_flags; uchar *null_flags;
IO_CACHE *io_cache; /* If sorted trough file*/ IO_CACHE *io_cache; /* If sorted trough file*/
@ -141,6 +141,7 @@ typedef struct st_table_list {
uint32 db_length, real_name_length; uint32 db_length, real_name_length;
Item *on_expr; /* Used with outer join */ Item *on_expr; /* Used with outer join */
struct st_table_list *natural_join; /* natural join on this table*/ struct st_table_list *natural_join; /* natural join on this table*/
/* ... join ... USE INDEX ... IGNORE INDEX */
List<String> *use_index,*ignore_index; List<String> *use_index,*ignore_index;
TABLE *table; TABLE *table;
GRANT_INFO grant; GRANT_INFO grant;