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

sql_base.cc, table.cc:

Browse Source 
After merge fix
This commit is contained in:
evgen@moonbone.local
2006-08-10 00:37:08 +04:00
parent 0d6996010c
commit 2e7f47c6f8
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_base.cc
View File

@ -2657,14 +2657,15 @@ retry:
error= (int) open_new_frm(thd, share, alias, error= (int) open_new_frm(thd, share, alias,
(uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE | (uint) (HA_OPEN_KEYFILE | HA_OPEN_RNDFILE |
HA_GET_INDEX | HA_TRY_READ_ONLY), HA_GET_INDEX | HA_TRY_READ_ONLY),
READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD, READ_KEYINFO | COMPUTE_TYPES | EXTRA_RECORD |
(flags & OPEN_VIEW_NO_PARSE),
thd->open_options, entry, table_list, thd->open_options, entry, table_list,
mem_root, (flags & OPEN_VIEW_NO_PARSE))); mem_root);
if (error) if (error)
goto err; goto err;
/* TODO: Don't free this */ /* TODO: Don't free this */
release_table_share(share, RELEASE_NORMAL); release_table_share(share, RELEASE_NORMAL);
DBUG_RETURN(0); DBUG_RETURN((flags & OPEN_VIEW_NO_PARSE)? -1 : 0);
} }
while ((error= open_table_from_share(thd, share, alias, while ((error= open_table_from_share(thd, share, alias,

3
sql/table.cc
View File

@ -352,9 +352,6 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
} }
else else
goto err; goto err;
if (prgflag & OPEN_VIEW_NO_PARSE)
goto err;
/* No handling of text based files yet */ /* No handling of text based files yet */
if (table_type == 1) if (table_type == 1)