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
fd17c119
Commit
fd17c119
authored
Nov 06, 2000
by
sasha@mysql.sashanet.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents
1157c688
2b05ed9d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
5 deletions
+30
-5
.bzrignore
.bzrignore
+1
-0
sql/item_strfunc.cc
sql/item_strfunc.cc
+10
-0
sql/item_strfunc.h
sql/item_strfunc.h
+7
-1
sql/mini_client.cc
sql/mini_client.cc
+5
-0
sql/mini_client.h
sql/mini_client.h
+2
-0
sql/mysqlbinlog.cc
sql/mysqlbinlog.cc
+1
-1
sql/slave.cc
sql/slave.cc
+3
-2
sql/sql_repl.cc
sql/sql_repl.cc
+1
-1
No files found.
.bzrignore
View file @
fd17c119
...
@@ -173,3 +173,4 @@ mysql-test/var/lib/test/elt_ck2.frm
...
@@ -173,3 +173,4 @@ mysql-test/var/lib/test/elt_ck2.frm
mysql-test/var/lib/test/elt_ck2.MYD
mysql-test/var/lib/test/elt_ck2.MYD
mysql-test/var/lib/test/elt_ck2.MYI
mysql-test/var/lib/test/elt_ck2.MYI
repl-tests/test-repl-ts/repl-timestamp.master.reject
repl-tests/test-repl-ts/repl-timestamp.master.reject
client/.mysqladmin.c.swp
sql/item_strfunc.cc
View file @
fd17c119
...
@@ -309,6 +309,16 @@ void Item_func_concat_ws::fix_length_and_dec()
...
@@ -309,6 +309,16 @@ void Item_func_concat_ws::fix_length_and_dec()
max_length
=
MAX_BLOB_WIDTH
;
max_length
=
MAX_BLOB_WIDTH
;
maybe_null
=
1
;
maybe_null
=
1
;
}
}
used_tables_cache
|=
separator
->
used_tables
();
const_item_cache
&=
separator
->
const_item
();
}
void
Item_func_concat_ws
::
update_used_tables
()
{
Item_func
::
update_used_tables
();
separator
->
update_used_tables
();
used_tables_cache
|=
separator
->
used_tables
();
const_item_cache
&=
separator
->
const_item
();
}
}
...
...
sql/item_strfunc.h
View file @
fd17c119
...
@@ -69,7 +69,13 @@ class Item_func_concat_ws :public Item_str_func
...
@@ -69,7 +69,13 @@ class Item_func_concat_ws :public Item_str_func
~
Item_func_concat_ws
()
{
delete
separator
;
}
~
Item_func_concat_ws
()
{
delete
separator
;
}
String
*
val_str
(
String
*
);
String
*
val_str
(
String
*
);
void
fix_length_and_dec
();
void
fix_length_and_dec
();
const
char
*
func_name
()
const
{
return
"concat_ws"
;
}
void
update_used_tables
();
bool
fix_fields
(
THD
*
thd
,
struct
st_table_list
*
tlist
)
{
return
(
separator
->
fix_fields
(
thd
,
tlist
)
||
Item_func
::
fix_fields
(
thd
,
tlist
));
}
const
char
*
func_name
()
const
{
return
"concat_ws"
;
}
};
};
class
Item_func_reverse
:
public
Item_str_func
class
Item_func_reverse
:
public
Item_str_func
...
...
sql/mini_client.cc
View file @
fd17c119
...
@@ -371,6 +371,11 @@ char * STDCALL mc_mysql_error(MYSQL *mysql)
...
@@ -371,6 +371,11 @@ char * STDCALL mc_mysql_error(MYSQL *mysql)
return
(
mysql
)
->
net
.
last_error
;
return
(
mysql
)
->
net
.
last_error
;
}
}
int
STDCALL
mc_mysql_errno
(
MYSQL
*
mysql
)
{
return
(
mysql
)
->
net
.
last_errno
;
}
my_bool
STDCALL
mc_mysql_reconnect
(
MYSQL
*
mysql
)
my_bool
STDCALL
mc_mysql_reconnect
(
MYSQL
*
mysql
)
{
{
MYSQL
tmp_mysql
;
MYSQL
tmp_mysql
;
...
...
sql/mini_client.h
View file @
fd17c119
...
@@ -39,7 +39,9 @@ uint STDCALL
...
@@ -39,7 +39,9 @@ uint STDCALL
mc_net_safe_read
(
MYSQL
*
mysql
);
mc_net_safe_read
(
MYSQL
*
mysql
);
char
*
STDCALL
mc_mysql_error
(
MYSQL
*
mysql
);
char
*
STDCALL
mc_mysql_error
(
MYSQL
*
mysql
);
int
STDCALL
mc_mysql_errno
(
MYSQL
*
mysql
);
my_bool
STDCALL
mc_mysql_reconnect
(
MYSQL
*
mysql
);
my_bool
STDCALL
mc_mysql_reconnect
(
MYSQL
*
mysql
);
#endif
#endif
sql/mysqlbinlog.cc
View file @
fd17c119
...
@@ -321,7 +321,7 @@ static void dump_local_log_entries(const char* logname)
...
@@ -321,7 +321,7 @@ static void dump_local_log_entries(const char* logname)
if
(
!
file
)
if
(
!
file
)
die
(
"Could not open log file %s"
,
logname
);
die
(
"Could not open log file %s"
,
logname
);
if
(
my_fseek
(
file
,
position
,
MY_SEEK_SET
,
MYF
(
MY_WME
)))
if
(
my_fseek
(
file
,
position
,
MY_SEEK_SET
,
MYF
(
MY_WME
))
==
MY_FILEPOS_ERROR
)
die
(
"failed on my_fseek()"
);
die
(
"failed on my_fseek()"
);
if
(
!
position
)
if
(
!
position
)
...
...
sql/slave.cc
View file @
fd17c119
...
@@ -562,8 +562,9 @@ static uint read_event(MYSQL* mysql, MASTER_INFO *mi)
...
@@ -562,8 +562,9 @@ static uint read_event(MYSQL* mysql, MASTER_INFO *mi)
return
packet_error
;
return
packet_error
;
if
(
len
==
packet_error
||
(
int
)
len
<
1
)
if
(
len
==
packet_error
||
(
int
)
len
<
1
)
{
{
sql_print_error
(
"Error reading packet from server: %s (%d)"
,
sql_print_error
(
"Error reading packet from server: %s (read_errno %d,\
mc_mysql_error
(
mysql
),
read_errno
);
server_errno=%d)"
,
mc_mysql_error
(
mysql
),
read_errno
,
mc_mysql_errno
(
mysql
));
return
packet_error
;
return
packet_error
;
}
}
...
...
sql/sql_repl.cc
View file @
fd17c119
...
@@ -466,7 +466,7 @@ sweepstakes if you report the bug";
...
@@ -466,7 +466,7 @@ sweepstakes if you report the bug";
pthread_mutex_unlock
(
&
LOCK_thread_count
);
pthread_mutex_unlock
(
&
LOCK_thread_count
);
if
(
log
)
if
(
log
)
(
void
)
my_fclose
(
log
,
MYF
(
MY_WME
));
(
void
)
my_fclose
(
log
,
MYF
(
MY_WME
));
send_error
(
&
thd
->
net
,
0
,
errmsg
);
send_error
(
&
thd
->
net
,
my_errno
,
errmsg
);
DBUG_VOID_RETURN
;
DBUG_VOID_RETURN
;
}
}
...
...
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