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
84f761da
Commit
84f761da
authored
16 years ago
by
gkodinov/kgeorge@macbook.gmz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for warnings and compile errors for the fix of bug 26243
parent
7cb4b7c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
extra/charset2html.c
extra/charset2html.c
+2
-0
sql/ha_berkeley.cc
sql/ha_berkeley.cc
+4
-4
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/sql_union.cc
sql/sql_union.cc
+2
-0
No files found.
extra/charset2html.c
View file @
84f761da
...
...
@@ -153,7 +153,9 @@ int main(int argc, char **argv) {
my_init
();
if
(
argc
>
argcnt
&&
argv
[
argcnt
][
0
]
==
'-'
&&
argv
[
argcnt
][
1
]
==
'#'
)
{
DBUG_PUSH
(
argv
[
argcnt
++
]
+
2
);
}
if
(
argc
>
argcnt
)
the_set
=
argv
[
argcnt
++
];
...
...
This diff is collapsed.
Click to expand it.
sql/ha_berkeley.cc
View file @
84f761da
...
...
@@ -467,7 +467,7 @@ berkeley_cmp_packed_key(DB *file, const DBT *new_key, const DBT *saved_key)
KEY_PART_INFO
*
key_part
=
key
->
key_part
,
*
end
=
key_part
+
key
->
key_parts
;
uint
key_length
=
new_key
->
size
;
DBUG_DUMP
(
"key_in_index"
,
saved_key_ptr
,
saved_key
->
size
);
DBUG_DUMP
(
"key_in_index"
,
(
uchar
*
)
saved_key_ptr
,
saved_key
->
size
);
for
(;
key_part
!=
end
&&
(
int
)
key_length
>
0
;
key_part
++
)
{
int
cmp
;
...
...
@@ -903,7 +903,7 @@ DBT *ha_berkeley::create_key(DBT *key, uint keynr, char *buff,
key_length
-=
key_part
->
length
;
}
key
->
size
=
(
u_int32_t
)
(
buff
-
(
char
*
)
key
->
data
);
DBUG_DUMP
(
"key"
,(
char
*
)
key
->
data
,
key
->
size
);
DBUG_DUMP
(
"key"
,(
u
char
*
)
key
->
data
,
key
->
size
);
DBUG_RETURN
(
key
);
}
...
...
@@ -947,7 +947,7 @@ DBT *ha_berkeley::pack_key(DBT *key, uint keynr, char *buff,
key_length
-=
key_part
->
store_length
;
}
key
->
size
=
(
u_int32_t
)
(
buff
-
(
char
*
)
key
->
data
);
DBUG_DUMP
(
"key"
,(
char
*
)
key
->
data
,
key
->
size
);
DBUG_DUMP
(
"key"
,(
u
char
*
)
key
->
data
,
key
->
size
);
DBUG_RETURN
(
key
);
}
...
...
@@ -1705,7 +1705,7 @@ DBT *ha_berkeley::get_pos(DBT *to, byte *pos)
pos
+=
key_part
->
field
->
packed_col_length
((
char
*
)
pos
,
key_part
->
length
);
to
->
size
=
(
uint
)
(
pos
-
(
byte
*
)
to
->
data
);
}
DBUG_DUMP
(
"key"
,
(
char
*
)
to
->
data
,
to
->
size
);
DBUG_DUMP
(
"key"
,
(
u
char
*
)
to
->
data
,
to
->
size
);
return
to
;
}
...
...
This diff is collapsed.
Click to expand it.
sql/mysqld.cc
View file @
84f761da
...
...
@@ -6943,7 +6943,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
switch
(
optid
)
{
case
'#'
:
#ifndef DBUG_OFF
DBUG_
PUSH
(
argument
?
argument
:
default_dbug_option
);
DBUG_
SET_INITIAL
(
argument
?
argument
:
default_dbug_option
);
#endif
opt_endinfo
=
1
;
/* unireg: memory allocation */
break
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_union.cc
View file @
84f761da
...
...
@@ -444,7 +444,9 @@ bool st_select_lex_unit::exec()
}
/* re-enabling indexes for next subselect iteration */
if
(
union_distinct
&&
table
->
file
->
enable_indexes
(
HA_KEY_SWITCH_ALL
))
{
DBUG_ASSERT
(
0
);
}
}
for
(
SELECT_LEX
*
sl
=
select_cursor
;
sl
;
sl
=
sl
->
next_select
())
{
...
...
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