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
be53c6b7
Commit
be53c6b7
authored
22 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge hundin:/my/mysql-4.0 into tik.mysql.fi:/home/my/mysql-4.0
Docs/manual.texi: Auto merged client/mysql.cc: Auto merged
parents
c995b397
238ea9df
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
17 deletions
+12
-17
Docs/manual.texi
Docs/manual.texi
+3
-0
client/mysql.cc
client/mysql.cc
+7
-12
libmysql/libmysql.c
libmysql/libmysql.c
+1
-1
sql/sql_string.cc
sql/sql_string.cc
+1
-4
No files found.
Docs/manual.texi
View file @
be53c6b7
...
@@ -35305,6 +35305,9 @@ Note that if you use any other option to @code{ALTER TABLE} than
...
@@ -35305,6 +35305,9 @@ Note that if you use any other option to @code{ALTER TABLE} than
if the data wouldn't strictly need to be copied (like when you change the
if the data wouldn't strictly need to be copied (like when you change the
name of a column). We plan to fix this in the future, but as one doesn't
name of a column). We plan to fix this in the future, but as one doesn't
normally do @code{ALTER TABLE} that often this isn't that high on our TODO.
normally do @code{ALTER TABLE} that often this isn't that high on our TODO.
For MyISAM tables, you can speed up the index recreation part (which is the
slowest part of the recreation process) by setting the
@code{myisam_sort_buffer_size} variable to a high value.
@itemize @bullet
@itemize @bullet
@item
@item
This diff is collapsed.
Click to expand it.
client/mysql.cc
View file @
be53c6b7
...
@@ -354,18 +354,6 @@ int main(int argc,char *argv[])
...
@@ -354,18 +354,6 @@ int main(int argc,char *argv[])
mysql_thread_id
(
&
mysql
),
mysql_get_server_info
(
&
mysql
));
mysql_thread_id
(
&
mysql
),
mysql_get_server_info
(
&
mysql
));
put_info
((
char
*
)
glob_buffer
.
ptr
(),
INFO_INFO
);
put_info
((
char
*
)
glob_buffer
.
ptr
(),
INFO_INFO
);
#ifdef HAVE_OPENSSL
if
(
mysql
.
net
.
vio
->
ssl_
&&
SSL_get_cipher
(
mysql
.
net
.
vio
->
ssl_
))
{
sprintf
((
char
*
)
glob_buffer
.
ptr
(),
"SSL cipher in use is %s
\n
"
,
SSL_get_cipher
(
mysql
.
net
.
vio
->
ssl_
));
put_info
((
char
*
)
glob_buffer
.
ptr
(),
INFO_INFO
);
}
else
put_info
(
"SSL is not in use
\n
"
,
INFO_INFO
);
#endif
/* HAVE_OPENSSL */
#ifdef HAVE_READLINE
#ifdef HAVE_READLINE
initialize_readline
(
my_progname
);
initialize_readline
(
my_progname
);
if
(
!
status
.
batch
&&
!
quick
&&
!
opt_html
&&
!
opt_xml
)
if
(
!
status
.
batch
&&
!
quick
&&
!
opt_html
&&
!
opt_xml
)
...
@@ -2326,6 +2314,13 @@ com_status(String *buffer __attribute__((unused)),
...
@@ -2326,6 +2314,13 @@ com_status(String *buffer __attribute__((unused)),
tee_fprintf
(
stdout
,
"Current user:
\t\t
%s
\n
"
,
cur
[
1
]);
tee_fprintf
(
stdout
,
"Current user:
\t\t
%s
\n
"
,
cur
[
1
]);
(
void
)
mysql_fetch_row
(
result
);
// Read eof
(
void
)
mysql_fetch_row
(
result
);
// Read eof
}
}
#ifdef HAVE_OPENSSL
if
(
mysql
.
net
.
vio
->
ssl_
&&
SSL_get_cipher
(
mysql
.
net
.
vio
->
ssl_
))
tee_fprintf
(
"SSL cipher in use is %s
\n
"
,
SSL_get_cipher
(
mysql
.
net
.
vio
->
ssl_
));
else
#endif
/* HAVE_OPENSSL */
tee_puts
(
"SSL is not in use
\n
"
,
stdout
);
}
}
else
else
{
{
...
...
This diff is collapsed.
Click to expand it.
libmysql/libmysql.c
View file @
be53c6b7
...
@@ -698,7 +698,7 @@ static const char *default_options[]=
...
@@ -698,7 +698,7 @@ static const char *default_options[]=
"port"
,
"socket"
,
"compress"
,
"password"
,
"pipe"
,
"timeout"
,
"user"
,
"port"
,
"socket"
,
"compress"
,
"password"
,
"pipe"
,
"timeout"
,
"user"
,
"init-command"
,
"host"
,
"database"
,
"debug"
,
"return-found-rows"
,
"init-command"
,
"host"
,
"database"
,
"debug"
,
"return-found-rows"
,
"ssl-key"
,
"ssl-cert"
,
"ssl-ca"
,
"ssl-capath"
,
"ssl-key"
,
"ssl-cert"
,
"ssl-ca"
,
"ssl-capath"
,
"character-set-dir"
,
"default-character-set"
,
"interactive-timeout"
,
"character-set
s
-dir"
,
"default-character-set"
,
"interactive-timeout"
,
"connect-timeout"
,
"local-infile"
,
"disable-local-infile"
,
"connect-timeout"
,
"local-infile"
,
"disable-local-infile"
,
"replication-probe"
,
"enable-reads-from-master"
,
"repl-parse-query"
,
"replication-probe"
,
"enable-reads-from-master"
,
"repl-parse-query"
,
"ssl-cipher"
,
"ssl-cipher"
,
...
...
This diff is collapsed.
Click to expand it.
sql/sql_string.cc
View file @
be53c6b7
...
@@ -40,19 +40,16 @@ extern void sql_element_free(void *ptr);
...
@@ -40,19 +40,16 @@ extern void sql_element_free(void *ptr);
bool
String
::
real_alloc
(
uint32
arg_length
)
bool
String
::
real_alloc
(
uint32
arg_length
)
{
{
arg_length
=
ALIGN_SIZE
(
arg_length
+
1
);
arg_length
=
ALIGN_SIZE
(
arg_length
+
1
);
str_length
=
0
;
if
(
Alloced_length
<
arg_length
)
if
(
Alloced_length
<
arg_length
)
{
{
free
();
free
();
if
(
!
(
Ptr
=
(
char
*
)
my_malloc
(
arg_length
,
MYF
(
MY_WME
))))
if
(
!
(
Ptr
=
(
char
*
)
my_malloc
(
arg_length
,
MYF
(
MY_WME
))))
{
str_length
=
0
;
return
TRUE
;
return
TRUE
;
}
Alloced_length
=
arg_length
;
Alloced_length
=
arg_length
;
alloced
=
1
;
alloced
=
1
;
}
}
Ptr
[
0
]
=
0
;
Ptr
[
0
]
=
0
;
str_length
=
0
;
return
FALSE
;
return
FALSE
;
}
}
...
...
This diff is collapsed.
Click to expand it.
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