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
fec16a64
Commit
fec16a64
authored
Sep 10, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into eel.(none):/home/jonas/src/mysql-5.0-push
parents
5cc64308
62646826
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
10 deletions
+9
-10
extra/comp_err.c
extra/comp_err.c
+8
-8
sql/sql_select.cc
sql/sql_select.cc
+1
-2
No files found.
extra/comp_err.c
View file @
fec16a64
...
...
@@ -51,7 +51,7 @@ uint file_pos[MAX_ROWS];
const
char
*
empty_string
=
""
;
/* For empty states */
/*
Default values for command line options. See getopt structure for defintions
Default values for command line options. See getopt structure for defin
i
tions
for these.
*/
...
...
@@ -227,7 +227,7 @@ static int create_header_files(struct errors *error_head)
{
/*
generating mysqld_error.h
fprintf() will automaticly add \r on windows
fprintf() will automatic
al
ly add \r on windows
*/
fprintf
(
er_definef
,
"#define %s %d
\n
"
,
tmp_error
->
er_name
,
tmp_error
->
d_code
);
...
...
@@ -518,14 +518,14 @@ static uint parse_error_offset(char *str)
}
/* Parsing of the default language line. e.g. "default-lanuage eng" */
/* Parsing of the default language line. e.g. "default-lan
g
uage eng" */
static
char
*
parse_default_language
(
char
*
str
)
{
char
*
slang
;
DBUG_ENTER
(
"parse_default_language"
);
/* skipping the "default
_
language" keyword */
/* skipping the "default
-
language" keyword */
str
=
find_end_of_word
(
str
);
/* skipping space(s) and/or tabs after the keyword */
str
=
skip_delimiters
(
str
);
...
...
@@ -556,7 +556,7 @@ static char *parse_default_language(char *str)
/*
For given error
finds message on given language,
if does not exist,
For given error
, finds message in given language;
if does not exist,
returns english.
*/
...
...
@@ -697,7 +697,7 @@ static struct errors *parse_error_string(char *str, int er_count)
DBUG_ENTER
(
"parse_error_string"
);
DBUG_PRINT
(
"enter"
,
(
"str: %s"
,
str
));
/* create a new
a
element */
/* create a new element */
new_error
=
(
struct
errors
*
)
my_malloc
(
sizeof
(
*
new_error
),
MYF
(
MY_WME
));
if
(
my_init_dynamic_array
(
&
new_error
->
msg
,
sizeof
(
struct
message
),
0
,
0
))
...
...
@@ -762,7 +762,7 @@ static struct errors *parse_error_string(char *str, int er_count)
/*
Parsing the string with
charset/full lang name/short lang name
;
Parsing the string with
full lang name/short lang name/charset
;
returns pointer to the language structure
*/
...
...
@@ -814,7 +814,7 @@ static struct languages *parse_charset_string(char *str)
DBUG_RETURN
(
0
);
/* Fatal error */
DBUG_PRINT
(
"info"
,
(
"charset: %s"
,
new_lang
->
charset
));
/* skipping space, t
u
b or "," */
/* skipping space, t
a
b or "," */
str
=
skip_delimiters
(
str
);
}
while
(
*
str
!=
';'
&&
*
str
);
...
...
sql/sql_select.cc
View file @
fec16a64
...
...
@@ -8041,7 +8041,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
bool
table_cant_handle_bit_fields
,
uint
convert_blob_length
)
{
Item
::
Type
orig_type
;
Item
::
Type
orig_type
=
type
;
Item
*
orig_item
;
if
(
type
!=
Item
::
FIELD_ITEM
&&
...
...
@@ -8051,7 +8051,6 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
{
orig_item
=
item
;
item
=
item
->
real_item
();
orig_type
=
type
;
type
=
Item
::
FIELD_ITEM
;
}
switch
(
type
)
{
...
...
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