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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f79cabdc
Commit
f79cabdc
authored
Apr 08, 2003
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
a fix for a crashing bug when attempting to create InnoDB table
with GEOMETRY field type.
parent
b998c3fa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
sql/ha_myisam.h
sql/ha_myisam.h
+1
-1
sql/handler.h
sql/handler.h
+1
-0
sql/sql_table.cc
sql/sql_table.cc
+6
-0
No files found.
sql/ha_myisam.h
View file @
f79cabdc
...
@@ -46,7 +46,7 @@ class ha_myisam: public handler
...
@@ -46,7 +46,7 @@ class ha_myisam: public handler
ha_myisam
(
TABLE
*
table
)
:
handler
(
table
),
file
(
0
),
ha_myisam
(
TABLE
*
table
)
:
handler
(
table
),
file
(
0
),
int_table_flags
(
HA_READ_RND_SAME
|
HA_KEYPOS_TO_RNDPOS
|
HA_LASTKEY_ORDER
|
int_table_flags
(
HA_READ_RND_SAME
|
HA_KEYPOS_TO_RNDPOS
|
HA_LASTKEY_ORDER
|
HA_NULL_KEY
|
HA_CAN_FULLTEXT
|
HA_CAN_SQL_HANDLER
|
HA_NULL_KEY
|
HA_CAN_FULLTEXT
|
HA_CAN_SQL_HANDLER
|
HA_DUPP_POS
|
HA_BLOB_KEY
|
HA_AUTO_PART_KEY
),
HA_DUPP_POS
|
HA_BLOB_KEY
|
HA_AUTO_PART_KEY
|
HA_HAS_GEOMETRY
),
enable_activate_all_index
(
1
)
enable_activate_all_index
(
1
)
{}
{}
~
ha_myisam
()
{}
~
ha_myisam
()
{}
...
...
sql/handler.h
View file @
f79cabdc
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
#define HA_TABLE_SCAN_ON_INDEX 4
/* No separate data/index file */
#define HA_TABLE_SCAN_ON_INDEX 4
/* No separate data/index file */
#define HA_REC_NOT_IN_SEQ 8
/* ha_info don't return recnumber;
#define HA_REC_NOT_IN_SEQ 8
/* ha_info don't return recnumber;
It returns a position to ha_r_rnd */
It returns a position to ha_r_rnd */
#define HA_HAS_GEOMETRY 16
#define HA_NO_INDEX 32
/* No index needed for next/prev */
#define HA_NO_INDEX 32
/* No index needed for next/prev */
#define HA_KEY_READ_WRONG_STR 64
/* keyread returns converted strings */
#define HA_KEY_READ_WRONG_STR 64
/* keyread returns converted strings */
#define HA_NULL_KEY 128
/* One can have keys with NULL */
#define HA_NULL_KEY 128
/* One can have keys with NULL */
...
...
sql/sql_table.cc
View file @
f79cabdc
...
@@ -486,6 +486,12 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
...
@@ -486,6 +486,12 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
blob_columns
++
;
blob_columns
++
;
break
;
break
;
case
FIELD_TYPE_GEOMETRY
:
case
FIELD_TYPE_GEOMETRY
:
if
(
!
(
file
->
table_flags
()
&
HA_HAS_GEOMETRY
))
{
my_printf_error
(
ER_WRONG_USAGE
,
ER
(
ER_WRONG_USAGE
),
MYF
(
0
),
"GEOMETRY FIELD TYPE"
,
"not supported by this storage engine "
);
DBUG_RETURN
(
-
1
);
}
sql_field
->
pack_flag
=
FIELDFLAG_GEOM
|
sql_field
->
pack_flag
=
FIELDFLAG_GEOM
|
pack_length_to_packflag
(
sql_field
->
pack_length
-
pack_length_to_packflag
(
sql_field
->
pack_length
-
portable_sizeof_char_ptr
);
portable_sizeof_char_ptr
);
...
...
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