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
0f8ae023
Commit
0f8ae023
authored
May 04, 2009
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug#44166
removed few sprintf's
parent
ce10b71b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
14 deletions
+11
-14
sql/item.cc
sql/item.cc
+6
-8
sql/sql_table.cc
sql/sql_table.cc
+1
-1
sql/sql_update.cc
sql/sql_update.cc
+3
-3
sql/unireg.cc
sql/unireg.cc
+1
-2
No files found.
sql/item.cc
View file @
0f8ae023
...
@@ -3390,14 +3390,12 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
...
@@ -3390,14 +3390,12 @@ static void mark_as_dependent(THD *thd, SELECT_LEX *last, SELECT_LEX *current,
current
->
mark_as_dependent
(
last
);
current
->
mark_as_dependent
(
last
);
if
(
thd
->
lex
->
describe
&
DESCRIBE_EXTENDED
)
if
(
thd
->
lex
->
describe
&
DESCRIBE_EXTENDED
)
{
{
char
warn_buff
[
MYSQL_ERRMSG_SIZE
];
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
sprintf
(
warn_buff
,
ER
(
ER_WARN_FIELD_RESOLVED
),
ER_WARN_FIELD_RESOLVED
,
ER
(
ER_WARN_FIELD_RESOLVED
),
db_name
,
(
db_name
[
0
]
?
"."
:
""
),
db_name
,
(
db_name
[
0
]
?
"."
:
""
),
table_name
,
(
table_name
[
0
]
?
"."
:
""
),
table_name
,
(
table_name
[
0
]
?
"."
:
""
),
resolved_item
->
field_name
,
resolved_item
->
field_name
,
current
->
select_number
,
last
->
select_number
);
current
->
select_number
,
last
->
select_number
);
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_WARN_FIELD_RESOLVED
,
warn_buff
);
}
}
}
}
...
...
sql/sql_table.cc
View file @
0f8ae023
...
@@ -3126,7 +3126,7 @@ static bool prepare_blob_field(THD *thd, Create_field *sql_field)
...
@@ -3126,7 +3126,7 @@ static bool prepare_blob_field(THD *thd, Create_field *sql_field)
}
}
sql_field
->
sql_type
=
MYSQL_TYPE_BLOB
;
sql_field
->
sql_type
=
MYSQL_TYPE_BLOB
;
sql_field
->
flags
|=
BLOB_FLAG
;
sql_field
->
flags
|=
BLOB_FLAG
;
sprintf
(
warn_buff
,
ER
(
ER_AUTO_CONVERT
),
sql_field
->
field_name
,
my_snprintf
(
warn_buff
,
sizeof
(
warn_buff
)
,
ER
(
ER_AUTO_CONVERT
),
sql_field
->
field_name
,
(
sql_field
->
charset
==
&
my_charset_bin
)
?
"VARBINARY"
:
"VARCHAR"
,
(
sql_field
->
charset
==
&
my_charset_bin
)
?
"VARBINARY"
:
"VARCHAR"
,
(
sql_field
->
charset
==
&
my_charset_bin
)
?
"BLOB"
:
"TEXT"
);
(
sql_field
->
charset
==
&
my_charset_bin
)
?
"BLOB"
:
"TEXT"
);
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_AUTO_CONVERT
,
push_warning
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_AUTO_CONVERT
,
...
...
sql/sql_update.cc
View file @
0f8ae023
...
@@ -818,7 +818,7 @@ int mysql_update(THD *thd,
...
@@ -818,7 +818,7 @@ int mysql_update(THD *thd,
if
(
error
<
0
)
if
(
error
<
0
)
{
{
char
buff
[
STRING_BUFFER_USUAL_SIZE
];
char
buff
[
STRING_BUFFER_USUAL_SIZE
];
sprintf
(
buff
,
ER
(
ER_UPDATE_INFO
),
(
ulong
)
found
,
(
ulong
)
updated
,
my_snprintf
(
buff
,
sizeof
(
buff
)
,
ER
(
ER_UPDATE_INFO
),
(
ulong
)
found
,
(
ulong
)
updated
,
(
ulong
)
thd
->
cuted_fields
);
(
ulong
)
thd
->
cuted_fields
);
thd
->
row_count_func
=
thd
->
row_count_func
=
(
thd
->
client_capabilities
&
CLIENT_FOUND_ROWS
)
?
found
:
updated
;
(
thd
->
client_capabilities
&
CLIENT_FOUND_ROWS
)
?
found
:
updated
;
...
@@ -2066,8 +2066,8 @@ bool multi_update::send_eof()
...
@@ -2066,8 +2066,8 @@ bool multi_update::send_eof()
id
=
thd
->
arg_of_last_insert_id_function
?
id
=
thd
->
arg_of_last_insert_id_function
?
thd
->
first_successful_insert_id_in_prev_stmt
:
0
;
thd
->
first_successful_insert_id_in_prev_stmt
:
0
;
sprintf
(
buff
,
ER
(
ER_UPDATE_INFO
),
(
ulong
)
found
,
(
ulong
)
updated
,
my_snprintf
(
buff
,
sizeof
(
buff
),
ER
(
ER_UPDATE_INFO
)
,
(
ulong
)
thd
->
cuted_fields
);
(
ulong
)
found
,
(
ulong
)
updated
,
(
ulong
)
thd
->
cuted_fields
);
thd
->
row_count_func
=
thd
->
row_count_func
=
(
thd
->
client_capabilities
&
CLIENT_FOUND_ROWS
)
?
found
:
updated
;
(
thd
->
client_capabilities
&
CLIENT_FOUND_ROWS
)
?
found
:
updated
;
::
my_ok
(
thd
,
(
ulong
)
thd
->
row_count_func
,
id
,
buff
);
::
my_ok
(
thd
,
(
ulong
)
thd
->
row_count_func
,
id
,
buff
);
...
...
sql/unireg.cc
View file @
0f8ae023
...
@@ -37,8 +37,7 @@ static bool pack_header(uchar *forminfo,enum legacy_db_type table_type,
...
@@ -37,8 +37,7 @@ static bool pack_header(uchar *forminfo,enum legacy_db_type table_type,
List
<
Create_field
>
&
create_fields
,
List
<
Create_field
>
&
create_fields
,
uint
info_length
,
uint
screens
,
uint
table_options
,
uint
info_length
,
uint
screens
,
uint
table_options
,
ulong
data_offset
,
handler
*
file
);
ulong
data_offset
,
handler
*
file
);
static
uint
get_interval_id
(
uint
*
int_count
,
List
<
Create_field
>
&
create_fields
,
static
uint
get_interval_id
(
uint
*
,
List
<
Create_field
>
&
,
Create_field
*
);
Create_field
*
last_field
);
static
bool
pack_fields
(
File
file
,
List
<
Create_field
>
&
create_fields
,
static
bool
pack_fields
(
File
file
,
List
<
Create_field
>
&
create_fields
,
ulong
data_offset
);
ulong
data_offset
);
static
bool
make_empty_rec
(
THD
*
thd
,
int
file
,
enum
legacy_db_type
table_type
,
static
bool
make_empty_rec
(
THD
*
thd
,
int
file
,
enum
legacy_db_type
table_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