Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
97119316
Commit
97119316
authored
Jun 23, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/mnt/storeage/mysql-5.0-maint
into mysql.com:/mnt/storeage/mysql-5.0-maint_bug20616
parents
95239e1d
a4c1111a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
9 deletions
+16
-9
sql/sql_table.cc
sql/sql_table.cc
+16
-1
sql/table.cc
sql/table.cc
+0
-8
No files found.
sql/sql_table.cc
View file @
97119316
...
...
@@ -1656,8 +1656,23 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
my_casedn_str
(
files_charset_info
,
path
);
create_info
->
table_options
|=
HA_CREATE_DELAY_KEY_WRITE
;
}
else
else
{
#ifdef FN_DEVCHAR
/* check if the table name contains FN_DEVCHAR when defined */
const
char
*
start
=
alias
;
while
(
*
start
!=
'\0'
)
{
if
(
*
start
==
FN_DEVCHAR
)
{
my_error
(
ER_WRONG_TABLE_NAME
,
MYF
(
0
),
alias
);
DBUG_RETURN
(
TRUE
);
}
start
++
;
}
#endif
build_table_path
(
path
,
sizeof
(
path
),
db
,
alias
,
reg_ext
);
}
/* Check if table already exists */
if
((
create_info
->
options
&
HA_LEX_CREATE_TMP_TABLE
)
...
...
sql/table.cc
View file @
97119316
...
...
@@ -1614,10 +1614,6 @@ bool check_db_name(char *name)
if
(
*
name
==
'/'
||
*
name
==
'\\'
||
*
name
==
FN_LIBCHAR
||
*
name
==
FN_EXTCHAR
)
return
1
;
#ifdef FN_DEVCHAR
if
(
*
name
==
FN_DEVCHAR
)
return
1
;
#endif
name
++
;
}
return
last_char_is_space
||
(
uint
)
(
name
-
start
)
>
NAME_LEN
;
...
...
@@ -1660,10 +1656,6 @@ bool check_table_name(const char *name, uint length)
#endif
if
(
*
name
==
'/'
||
*
name
==
'\\'
||
*
name
==
FN_EXTCHAR
)
return
1
;
#ifdef FN_DEVCHAR
if
(
*
name
==
FN_DEVCHAR
)
return
1
;
#endif
name
++
;
}
#if defined(USE_MB) && defined(USE_MB_IDENT)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment