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
e2ba3a11
Commit
e2ba3a11
authored
19 years ago
by
wax@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
parents
36edf829
75f6c8ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
myisam/mi_check.c
myisam/mi_check.c
+2
-0
sql/set_var.cc
sql/set_var.cc
+1
-1
No files found.
BitKeeper/etc/logging_ok
View file @
e2ba3a11
...
@@ -164,6 +164,7 @@ paul@frost.snake.net
...
@@ -164,6 +164,7 @@ paul@frost.snake.net
paul@ice.local
paul@ice.local
paul@ice.snake.net
paul@ice.snake.net
paul@kite-hub.kitebird.com
paul@kite-hub.kitebird.com
paul@snake-hub.snake.net
paul@teton.kitebird.com
paul@teton.kitebird.com
pekka@mysql.com
pekka@mysql.com
pem@mysql.com
pem@mysql.com
...
...
This diff is collapsed.
Click to expand it.
myisam/mi_check.c
View file @
e2ba3a11
...
@@ -1466,12 +1466,14 @@ static int writekeys(MI_CHECK *param, register MI_INFO *info, byte *buff,
...
@@ -1466,12 +1466,14 @@ static int writekeys(MI_CHECK *param, register MI_INFO *info, byte *buff,
if
(
_mi_ft_add
(
info
,
i
,(
char
*
)
key
,
buff
,
filepos
))
if
(
_mi_ft_add
(
info
,
i
,(
char
*
)
key
,
buff
,
filepos
))
goto
err
;
goto
err
;
}
}
#ifdef HAVE_SPATIAL
else
if
(
info
->
s
->
keyinfo
[
i
].
flag
&
HA_SPATIAL
)
else
if
(
info
->
s
->
keyinfo
[
i
].
flag
&
HA_SPATIAL
)
{
{
uint
key_length
=
_mi_make_key
(
info
,
i
,
key
,
buff
,
filepos
);
uint
key_length
=
_mi_make_key
(
info
,
i
,
key
,
buff
,
filepos
);
if
(
rtree_insert
(
info
,
i
,
key
,
key_length
))
if
(
rtree_insert
(
info
,
i
,
key
,
key_length
))
goto
err
;
goto
err
;
}
}
#endif
/*HAVE_SPATIAL*/
else
else
{
{
uint
key_length
=
_mi_make_key
(
info
,
i
,
key
,
buff
,
filepos
);
uint
key_length
=
_mi_make_key
(
info
,
i
,
key
,
buff
,
filepos
);
...
...
This diff is collapsed.
Click to expand it.
sql/set_var.cc
View file @
e2ba3a11
...
@@ -2948,7 +2948,7 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var)
...
@@ -2948,7 +2948,7 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var)
enum
db_type
db_type
;
enum
db_type
db_type
;
if
(
!
(
res
=
var
->
value
->
val_str
(
&
str
))
||
if
(
!
(
res
=
var
->
value
->
val_str
(
&
str
))
||
!
(
var
->
save_result
.
ulong_value
=
!
(
var
->
save_result
.
ulong_value
=
(
ulong
)
db_type
=
ha_resolve_by_name
(
res
->
ptr
(),
res
->
length
(
)))
||
(
ulong
)
(
db_type
=
ha_resolve_by_name
(
res
->
ptr
(),
res
->
length
()
)))
||
ha_checktype
(
db_type
)
!=
db_type
)
ha_checktype
(
db_type
)
!=
db_type
)
{
{
value
=
res
?
res
->
c_ptr
()
:
"NULL"
;
value
=
res
?
res
->
c_ptr
()
:
"NULL"
;
...
...
This diff is collapsed.
Click to expand it.
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