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
4adb4256
Commit
4adb4256
authored
Apr 04, 2013
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Update some DBUG_PRINT to avois warning on Linux
modified: storage/connect/connect.cc storage/connect/ha_connect.cc
parent
7e0f591f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
storage/connect/connect.cc
storage/connect/connect.cc
+2
-2
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+8
-8
No files found.
storage/connect/connect.cc
View file @
4adb4256
...
@@ -779,14 +779,14 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
...
@@ -779,14 +779,14 @@ int CntIndexRange(PGLOBAL g, PTDB ptdb, const uchar* *key, uint *len,
return
-
1
;
return
-
1
;
else
if
(
!
((
PTDBASE
)
ptdb
)
->
GetDef
()
->
Indexable
())
{
else
if
(
!
((
PTDBASE
)
ptdb
)
->
GetDef
()
->
Indexable
())
{
sprintf
(
g
->
Message
,
"Table %s is not indexable"
,
ptdb
->
GetName
());
sprintf
(
g
->
Message
,
"Table %s is not indexable"
,
ptdb
->
GetName
());
DBUG_PRINT
(
"Range"
,
(
g
->
Message
));
DBUG_PRINT
(
"Range"
,
(
"%s"
,
g
->
Message
));
return
-
1
;
return
-
1
;
}
else
}
else
tdbp
=
(
PTDBDOX
)
ptdb
;
tdbp
=
(
PTDBDOX
)
ptdb
;
if
(
!
tdbp
->
To_Link
||
!
tdbp
->
To_Kindex
)
{
if
(
!
tdbp
->
To_Link
||
!
tdbp
->
To_Kindex
)
{
sprintf
(
g
->
Message
,
"Index not initialized for table %s"
,
tdbp
->
Name
);
sprintf
(
g
->
Message
,
"Index not initialized for table %s"
,
tdbp
->
Name
);
DBUG_PRINT
(
"Range"
,
(
g
->
Message
));
DBUG_PRINT
(
"Range"
,
(
"%s"
,
g
->
Message
));
return
-
1
;
return
-
1
;
}
else
}
else
xbp
=
(
XXBASE
*
)
tdbp
->
To_Kindex
;
xbp
=
(
XXBASE
*
)
tdbp
->
To_Kindex
;
...
...
storage/connect/ha_connect.cc
View file @
4adb4256
...
@@ -1527,13 +1527,13 @@ int ha_connect::MakeRecord(char *buf)
...
@@ -1527,13 +1527,13 @@ int ha_connect::MakeRecord(char *buf)
if
(
value
->
GetIntValue
())
if
(
value
->
GetIntValue
())
rc
=
HA_ERR_WRONG_IN_RECORD
;
rc
=
HA_ERR_WRONG_IN_RECORD
;
DBUG_PRINT
(
"MakeRecord"
,
(
p
));
DBUG_PRINT
(
"MakeRecord"
,
(
"%s"
,
p
));
}
// endif store
}
// endif store
}
else
}
else
if
(
fp
->
store
(
value
->
GetFloatValue
()))
{
if
(
fp
->
store
(
value
->
GetFloatValue
()))
{
rc
=
HA_ERR_WRONG_IN_RECORD
;
rc
=
HA_ERR_WRONG_IN_RECORD
;
DBUG_PRINT
(
"MakeRecord"
,
(
value
->
GetCharString
(
val
)));
DBUG_PRINT
(
"MakeRecord"
,
(
"%s"
,
value
->
GetCharString
(
val
)));
}
// endif store
}
// endif store
fp
->
set_notnull
();
fp
->
set_notnull
();
...
@@ -2220,7 +2220,7 @@ int ha_connect::write_row(uchar *buf)
...
@@ -2220,7 +2220,7 @@ int ha_connect::write_row(uchar *buf)
// Return result code from write operation
// Return result code from write operation
if
(
CntWriteRow
(
g
,
tdbp
))
{
if
(
CntWriteRow
(
g
,
tdbp
))
{
DBUG_PRINT
(
"write_row"
,
(
g
->
Message
));
DBUG_PRINT
(
"write_row"
,
(
"%s"
,
g
->
Message
));
printf
(
"write_row: %s
\n
"
,
g
->
Message
);
printf
(
"write_row: %s
\n
"
,
g
->
Message
);
rc
=
HA_ERR_INTERNAL_ERROR
;
rc
=
HA_ERR_INTERNAL_ERROR
;
}
// endif RC
}
// endif RC
...
@@ -2265,7 +2265,7 @@ int ha_connect::update_row(const uchar *old_data, uchar *new_data)
...
@@ -2265,7 +2265,7 @@ int ha_connect::update_row(const uchar *old_data, uchar *new_data)
return
rc
;
return
rc
;
if
(
CntUpdateRow
(
g
,
tdbp
))
{
if
(
CntUpdateRow
(
g
,
tdbp
))
{
DBUG_PRINT
(
"update_row"
,
(
g
->
Message
));
DBUG_PRINT
(
"update_row"
,
(
"%s"
,
g
->
Message
));
printf
(
"update_row CONNECT: %s
\n
"
,
g
->
Message
);
printf
(
"update_row CONNECT: %s
\n
"
,
g
->
Message
);
rc
=
HA_ERR_INTERNAL_ERROR
;
rc
=
HA_ERR_INTERNAL_ERROR
;
}
// endif RC
}
// endif RC
...
@@ -2322,7 +2322,7 @@ int ha_connect::index_init(uint idx, bool sorted)
...
@@ -2322,7 +2322,7 @@ int ha_connect::index_init(uint idx, bool sorted)
indexing
=
CntIndexInit
(
g
,
tdbp
,
(
signed
)
idx
);
indexing
=
CntIndexInit
(
g
,
tdbp
,
(
signed
)
idx
);
if
(
indexing
<=
0
)
{
if
(
indexing
<=
0
)
{
DBUG_PRINT
(
"index_init"
,
(
g
->
Message
));
DBUG_PRINT
(
"index_init"
,
(
"%s"
,
g
->
Message
));
printf
(
"index_init CONNECT: %s
\n
"
,
g
->
Message
);
printf
(
"index_init CONNECT: %s
\n
"
,
g
->
Message
);
active_index
=
MAX_KEY
;
active_index
=
MAX_KEY
;
rc
=
HA_ERR_INTERNAL_ERROR
;
rc
=
HA_ERR_INTERNAL_ERROR
;
...
@@ -2374,7 +2374,7 @@ int ha_connect::ReadIndexed(uchar *buf, OPVAL op, const uchar *key, uint key_len
...
@@ -2374,7 +2374,7 @@ int ha_connect::ReadIndexed(uchar *buf, OPVAL op, const uchar *key, uint key_len
rc
=
(
op
==
OP_SAME
)
?
HA_ERR_END_OF_FILE
:
HA_ERR_KEY_NOT_FOUND
;
rc
=
(
op
==
OP_SAME
)
?
HA_ERR_END_OF_FILE
:
HA_ERR_KEY_NOT_FOUND
;
break
;
break
;
default:
// Read error
default:
// Read error
DBUG_PRINT
(
"ReadIndexed"
,
(
xp
->
g
->
Message
));
DBUG_PRINT
(
"ReadIndexed"
,
(
"%s"
,
xp
->
g
->
Message
));
printf
(
"ReadIndexed: %s
\n
"
,
xp
->
g
->
Message
);
printf
(
"ReadIndexed: %s
\n
"
,
xp
->
g
->
Message
);
rc
=
HA_ERR_INTERNAL_ERROR
;
rc
=
HA_ERR_INTERNAL_ERROR
;
}
// endswitch RC
}
// endswitch RC
...
@@ -4140,9 +4140,9 @@ int ha_connect::create(const char *name, TABLE *table_arg,
...
@@ -4140,9 +4140,9 @@ int ha_connect::create(const char *name, TABLE *table_arg,
if
(
*
buf
!=
'#'
)
{
if
(
*
buf
!=
'#'
)
{
// Check for incompatible options
// Check for incompatible options
if
(
options
->
sepindex
)
{
if
(
options
->
sepindex
)
{
my_
printf_error
(
ER_UNKNOWN_ERROR
,
my_
message
(
ER_UNKNOWN_ERROR
,
"SEPINDEX is incompatible with unspecified file name"
,
"SEPINDEX is incompatible with unspecified file name"
,
MYF
(
0
)
,
options
->
type
);
MYF
(
0
));
DBUG_RETURN
(
HA_ERR_UNSUPPORTED
);
DBUG_RETURN
(
HA_ERR_UNSUPPORTED
);
}
else
if
(
GetTypeID
(
options
->
type
)
==
TAB_VEC
)
}
else
if
(
GetTypeID
(
options
->
type
)
==
TAB_VEC
)
if
(
!
table
->
s
->
max_rows
||
options
->
split
)
{
if
(
!
table
->
s
->
max_rows
||
options
->
split
)
{
...
...
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