diff options
author | unknown <msvensson@neptunus.(none)> | 2005-09-13 09:41:01 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2005-09-13 09:41:01 +0200 |
commit | 9a96be05e02168b732dadd21708bac380a8d681b (patch) | |
tree | 94f1aaa519106717be593b5db6ac99f3e1c62457 /sql/table.h | |
parent | b50eb4cd42d2d5073afb2af5af8b19c825a9cca1 (diff) | |
parent | 74ea939fa2e4f83add96d0cee7020f8347f1bfae (diff) | |
download | mariadb-git-9a96be05e02168b732dadd21708bac380a8d681b.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/bug10713
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
sql/sql_select.cc:
Auto merged
mysql-test/r/mysqldump.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
sql/item.cc:
Manual merge
sql/sql_show.cc:
Manual merge
sql/table.h:
Manual merge
Diffstat (limited to 'sql/table.h')
-rw-r--r-- | sql/table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index d7c14e1938a..49104c9c1ff 100644 --- a/sql/table.h +++ b/sql/table.h @@ -576,6 +576,7 @@ typedef struct st_table_list /* TRUE if this merged view contain auto_increment field */ bool contain_auto_increment; bool multitable_view; /* TRUE iff this is multitable view */ + bool compact_view_format; /* Use compact format for SHOW CREATE VIEW */ /* view where processed */ bool where_processed; /* FRMTYPE_ERROR if any type is acceptable */ |