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
6588997e
Commit
6588997e
authored
May 14, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
beb5867d
6c981c0b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
6 deletions
+10
-6
libmysql/libmysql.c
libmysql/libmysql.c
+5
-2
sql/ha_blackhole.cc
sql/ha_blackhole.cc
+2
-1
sql/share/danish/errmsg.txt
sql/share/danish/errmsg.txt
+1
-1
sql/share/serbian/errmsg.txt
sql/share/serbian/errmsg.txt
+1
-1
sql/sql_base.cc
sql/sql_base.cc
+1
-1
No files found.
libmysql/libmysql.c
View file @
6588997e
...
...
@@ -3947,9 +3947,12 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind)
/*
We only need to check that stmt->field_count - if it is not null
stmt->bind was initialized in mysql_stmt_prepare
*/
stmt->bind overlaps with bind if mysql_stmt_bind_param
is called from mysql_stmt_store_result.
*/
memcpy
((
char
*
)
stmt
->
bind
,
(
char
*
)
bind
,
sizeof
(
MYSQL_BIND
)
*
bind_count
);
if
(
stmt
->
bind
!=
bind
)
memcpy
((
char
*
)
stmt
->
bind
,
(
char
*
)
bind
,
sizeof
(
MYSQL_BIND
)
*
bind_count
);
for
(
param
=
stmt
->
bind
,
end
=
param
+
bind_count
,
field
=
stmt
->
fields
;
param
<
end
;
...
...
sql/ha_blackhole.cc
View file @
6588997e
...
...
@@ -129,8 +129,9 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd,
THR_LOCK_DATA
**
to
,
enum
thr_lock_type
lock_type
)
{
if
(
lock_type
!=
TL_IGNORE
&&
lock
.
type
==
TL_UNLOCK
)
lock
.
type
=
lock_type
;
*
to
++=
&
lock
;
return
to
;
}
...
...
sql/share/danish/errmsg.txt
View file @
6588997e
...
...
@@ -262,7 +262,7 @@ character-set=latin1
"Key reference and table reference don't match",
"Operand should contain %d column(s)",
"Subquery returns more than 1 row",
"Unknown prepared statement handler (%
ld
) given to %s",
"Unknown prepared statement handler (%
.*s
) given to %s",
"Help database is corrupt or does not exist",
"Cyclic reference on subqueries",
"Converting column '%s' from %s to %s",
...
...
sql/share/serbian/errmsg.txt
View file @
6588997e
...
...
@@ -252,7 +252,7 @@ character-set=cp1250
"Key reference and table reference don't match",
"Operand should contain %d column(s)",
"Subquery returns more than 1 row",
"Unknown prepared statement handler (%
ld
) given to %s",
"Unknown prepared statement handler (%
.*s
) given to %s",
"Help database is corrupt or does not exist",
"Cyclic reference on subqueries",
"Converting column '%s' from %s to %s",
...
...
sql/sql_base.cc
View file @
6588997e
...
...
@@ -2522,7 +2522,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table,
if
((
pos
=
find_type
(
&
table
->
keynames
,
name
->
ptr
(),
name
->
length
(),
1
))
<=
0
)
{
my_error
(
ER_KEY_COLUMN_DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
(),
my_error
(
ER_KEY_COLUMN_DOES_NOT_EXITS
,
MYF
(
0
),
name
->
c_ptr
_safe
(),
table
->
real_name
);
map
->
set_all
();
return
1
;
...
...
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