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
6b5d02ac
Commit
6b5d02ac
authored
Jun 01, 2001
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
parents
20763b0d
57546cb7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
6 deletions
+40
-6
client/errmsg.c
client/errmsg.c
+30
-1
mysys/my_symlink2.c
mysys/my_symlink2.c
+10
-5
No files found.
client/errmsg.c
View file @
6b5d02ac
...
...
@@ -46,6 +46,35 @@ const char *client_errors[]=
"Kann den Status der Named Pipe nicht setzen. Host: %-.64s pipe: %-.32s (%lu)"
,
"Can't initialize character set %-.64s (path: %-.64s)"
,
"Got packet bigger than 'max_allowed_packet'"
,
"Embedded server"
};
/* Start of code added by Roberto M. Serqueira - martinsc@uol.com.br - 05.24.2001 */
#elif defined PORTUGUESE
const
char
*
client_errors
[]
=
{
"Erro desconhecido do MySQL"
,
"No pode criar 'UNIX socket' (%d)"
,
"No pode se conectar ao servidor MySQL local atravs do 'socket' '%-.64s' (%d)"
,
"No pode se conectar ao servidor MySQL em '%-.64s' (%d)"
,
"No pode criar 'socket TCP/IP' (%d)"
,
"'Host' servidor MySQL '%-.64s' (%d) desconhecido"
,
"Servidor MySQL desapareceu"
,
"Incompatibilidade de protocolos. Verso do Servidor: %d - Verso do Cliente: %d"
,
"Cliente do MySQL com falta de memria"
,
"Informao invlida de 'host'"
,
"Localhost via 'UNIX socket'"
,
"%-.64s via 'TCP/IP'"
,
"Erro na negociao de acesso ao servidor"
,
"Conexo perdida com servidor MySQL durante 'query'"
,
"Comandos fora de sincronismo. Voc no pode executar este comando agora"
,
"%-.64s via 'named pipe'"
,
"No pode esperar pelo 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)"
,
"No pode abrir 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)"
,
"No pode estabelecer o estado do 'named pipe' para o 'host' %-.64s - 'pipe' %-.32s (%lu)"
,
"No pode inicializar conjunto de caracteres %-.64s (caminho %-.64s)"
,
"Obteve pacote maior do que 'max_allowed_packet'"
,
"Embedded server"
,
};
...
...
@@ -73,7 +102,7 @@ const char *client_errors[]=
"Can't set state of named pipe to host: %-.64s pipe: %-.32s (%lu)"
,
"Can't initialize character set %-.64s (path: %-.64s)"
,
"Got packet bigger than 'max_allowed_packet'"
,
"Embedded server"
,
"Embedded server"
};
#endif
...
...
mysys/my_symlink2.c
View file @
6b5d02ac
...
...
@@ -87,13 +87,13 @@ int my_delete_with_symlink(const char *name, myf MyFlags)
int
my_rename_with_symlink
(
const
char
*
from
,
const
char
*
to
,
myf
MyFlags
)
{
#ifdef HAVE_READLINK
#if
n
def HAVE_READLINK
return
my_rename
(
from
,
to
,
MyFlags
);
#else
char
link_name
[
FN_REFLEN
],
tmp_name
[
FN_REFLEN
];
int
was_symlink
=
(
!
my_disable_symlinks
&&
!
my_readlink
(
link_name
,
name
,
MYF
(
0
)));
int
result
;
!
my_readlink
(
link_name
,
from
,
MYF
(
0
)));
int
result
=
0
;
DBUG_ENTER
(
"my_rename_with_symlink"
);
if
(
!
was_symlink
)
...
...
@@ -105,7 +105,7 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags)
/* Create new symlink */
if
(
my_symlink
(
tmp_name
,
to
,
MyFlags
))
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
1
);
/*
Rename symlinked file if the base name didn't change.
...
...
@@ -115,18 +115,23 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags)
if
(
strcmp
(
link_name
,
tmp_name
)
&&
my_rename
(
link_name
,
tmp_name
,
MyFlags
))
{
int
save_errno
=
my_errno
;
my_delete
(
to
,
MyFlags
);
/* Remove created symlink */
DBUG_RETURN
(
-
1
);
my_errno
=
save_errno
;
DBUG_RETURN
(
1
);
}
/* Remove original symlink */
if
(
my_delete
(
from
,
MyFlags
))
{
int
save_errno
=
my_errno
;
/* Remove created link */
my_delete
(
to
,
MyFlags
);
/* Rename file back */
if
(
strcmp
(
link_name
,
tmp_name
))
(
void
)
my_rename
(
tmp_name
,
link_name
,
MyFlags
);
my_errno
=
save_errno
;
result
=
1
;
}
DBUG_RETURN
(
result
);
#endif
/* HAVE_READLINK */
...
...
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