database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge

Browse Source 
into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1


mysql-test/r/sp_notembedded.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.h:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
tests/mysql_client_test.c:
  SCCS merged
This commit is contained in:
unknown
2006-07-18 18:43:55 +05:00
parent 98a63cde87 3e085bd882
commit 7f70e111dd
17 changed files with 377 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.h
View File

@@ -725,7 +725,9 @@ typedef struct st_ha_create_information
{
CHARSET_INFO *table_charset, *default_table_charset;
LEX_STRING connect_string;
const char *comment,*password, *tablespace;
const char *password, *tablespace;
LEX_STRING comment;
const char *password;
const char *data_file_name, *index_file_name;
const char *alias;
ulonglong max_rows,min_rows;