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
b3a87b58
Commit
b3a87b58
authored
May 23, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents
7ccf82c0
0e86cf8a
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
116 additions
and
61 deletions
+116
-61
client/mysql.cc
client/mysql.cc
+7
-1
libmysqld/embedded_priv.h
libmysqld/embedded_priv.h
+1
-0
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+19
-12
libmysqld/libmysqld.c
libmysqld/libmysqld.c
+1
-0
mysql-test/r/innodb.result
mysql-test/r/innodb.result
+23
-0
mysql-test/r/rpl_relayrotate.result
mysql-test/r/rpl_relayrotate.result
+0
-15
mysql-test/t/innodb-master.opt
mysql-test/t/innodb-master.opt
+0
-0
mysql-test/t/innodb.test
mysql-test/t/innodb.test
+33
-0
mysql-test/t/rpl_relayrotate.test
mysql-test/t/rpl_relayrotate.test
+0
-16
sql/handler.cc
sql/handler.cc
+2
-2
sql/sql_acl.cc
sql/sql_acl.cc
+6
-6
sql/sql_cache.cc
sql/sql_cache.cc
+17
-2
sql/sql_db.cc
sql/sql_db.cc
+1
-1
sql/sql_show.cc
sql/sql_show.cc
+1
-1
sql/sql_table.cc
sql/sql_table.cc
+5
-5
No files found.
client/mysql.cc
View file @
b3a87b58
...
@@ -371,10 +371,16 @@ int main(int argc,char *argv[])
...
@@ -371,10 +371,16 @@ int main(int argc,char *argv[])
!
(
status
.
line_buff
=
batch_readline_init
(
max_allowed_packet
+
512
,
stdin
)))
!
(
status
.
line_buff
=
batch_readline_init
(
max_allowed_packet
+
512
,
stdin
)))
{
{
free_defaults
(
defaults_argv
);
free_defaults
(
defaults_argv
);
my_end
(
0
);
exit
(
1
);
}
if
(
mysql_server_init
(
0
,
NULL
,
(
char
**
)
server_default_groups
))
{
free_defaults
(
defaults_argv
);
my_end
(
0
);
exit
(
1
);
exit
(
1
);
}
}
glob_buffer
.
realloc
(
512
);
glob_buffer
.
realloc
(
512
);
mysql_server_init
(
0
,
NULL
,
(
char
**
)
server_default_groups
);
completion_hash_init
(
&
ht
,
128
);
completion_hash_init
(
&
ht
,
128
);
init_alloc_root
(
&
hash_mem_root
,
16384
,
0
);
init_alloc_root
(
&
hash_mem_root
,
16384
,
0
);
bzero
((
char
*
)
&
mysql
,
sizeof
(
mysql
));
bzero
((
char
*
)
&
mysql
,
sizeof
(
mysql
));
...
...
libmysqld/embedded_priv.h
View file @
b3a87b58
...
@@ -28,5 +28,6 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
...
@@ -28,5 +28,6 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag, char *db);
void
*
create_embedded_thd
(
int
client_flag
,
char
*
db
);
void
*
create_embedded_thd
(
int
client_flag
,
char
*
db
);
int
check_embedded_connection
(
MYSQL
*
mysql
);
int
check_embedded_connection
(
MYSQL
*
mysql
);
void
free_old_query
(
MYSQL
*
mysql
);
void
free_old_query
(
MYSQL
*
mysql
);
void
embedded_get_error
(
MYSQL
*
mysql
);
extern
MYSQL_METHODS
embedded_methods
;
extern
MYSQL_METHODS
embedded_methods
;
C_MODE_END
C_MODE_END
libmysqld/lib_sql.cc
View file @
b3a87b58
...
@@ -42,6 +42,22 @@ C_MODE_START
...
@@ -42,6 +42,22 @@ C_MODE_START
#include "errmsg.h"
#include "errmsg.h"
#include <sql_common.h>
#include <sql_common.h>
void
embedded_get_error
(
MYSQL
*
mysql
)
{
THD
*
thd
=
(
THD
*
)
mysql
->
thd
;
NET
*
net
=
&
mysql
->
net
;
if
((
net
->
last_errno
=
thd
->
net
.
last_errno
))
{
memcpy
(
net
->
last_error
,
thd
->
net
.
last_error
,
sizeof
(
net
->
last_error
));
memcpy
(
net
->
sqlstate
,
thd
->
net
.
sqlstate
,
sizeof
(
net
->
sqlstate
));
}
else
{
net
->
last_error
[
0
]
=
0
;
strmov
(
net
->
sqlstate
,
not_error_sqlstate
);
}
}
static
my_bool
static
my_bool
emb_advanced_command
(
MYSQL
*
mysql
,
enum
enum_server_command
command
,
emb_advanced_command
(
MYSQL
*
mysql
,
enum
enum_server_command
command
,
const
char
*
header
,
ulong
header_length
,
const
char
*
header
,
ulong
header_length
,
...
@@ -86,16 +102,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
...
@@ -86,16 +102,7 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
if
(
!
skip_check
)
if
(
!
skip_check
)
result
=
thd
->
net
.
last_errno
?
-
1
:
0
;
result
=
thd
->
net
.
last_errno
?
-
1
:
0
;
if
((
net
->
last_errno
=
thd
->
net
.
last_errno
))
embedded_get_error
(
mysql
);
{
memcpy
(
net
->
last_error
,
thd
->
net
.
last_error
,
sizeof
(
net
->
last_error
));
memcpy
(
net
->
sqlstate
,
thd
->
net
.
sqlstate
,
sizeof
(
net
->
sqlstate
));
}
else
{
net
->
last_error
[
0
]
=
0
;
strmov
(
net
->
sqlstate
,
not_error_sqlstate
);
}
mysql
->
server_status
=
thd
->
server_status
;
mysql
->
server_status
=
thd
->
server_status
;
mysql
->
warning_count
=
((
THD
*
)
mysql
->
thd
)
->
total_warn_count
;
mysql
->
warning_count
=
((
THD
*
)
mysql
->
thd
)
->
total_warn_count
;
return
result
;
return
result
;
...
@@ -239,6 +246,7 @@ static void emb_free_embedded_thd(MYSQL *mysql)
...
@@ -239,6 +246,7 @@ static void emb_free_embedded_thd(MYSQL *mysql)
free_rows
(
thd
->
data
);
free_rows
(
thd
->
data
);
thread_count
--
;
thread_count
--
;
delete
thd
;
delete
thd
;
mysql
->
thd
=
0
;
}
}
static
const
char
*
emb_read_statistics
(
MYSQL
*
mysql
)
static
const
char
*
emb_read_statistics
(
MYSQL
*
mysql
)
...
@@ -498,8 +506,7 @@ int check_embedded_connection(MYSQL *mysql)
...
@@ -498,8 +506,7 @@ int check_embedded_connection(MYSQL *mysql)
thd
->
host
=
(
char
*
)
my_localhost
;
thd
->
host
=
(
char
*
)
my_localhost
;
thd
->
host_or_ip
=
thd
->
host
;
thd
->
host_or_ip
=
thd
->
host
;
thd
->
user
=
my_strdup
(
mysql
->
user
,
MYF
(
0
));
thd
->
user
=
my_strdup
(
mysql
->
user
,
MYF
(
0
));
check_user
(
thd
,
COM_CONNECT
,
NULL
,
0
,
thd
->
db
,
true
);
return
check_user
(
thd
,
COM_CONNECT
,
NULL
,
0
,
thd
->
db
,
true
);
return
0
;
}
}
#else
#else
...
...
libmysqld/libmysqld.c
View file @
b3a87b58
...
@@ -232,6 +232,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
...
@@ -232,6 +232,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
DBUG_RETURN
(
mysql
);
DBUG_RETURN
(
mysql
);
error:
error:
embedded_get_error
(
mysql
);
DBUG_PRINT
(
"error"
,(
"message: %u (%s)"
,
mysql
->
net
.
last_errno
,
DBUG_PRINT
(
"error"
,(
"message: %u (%s)"
,
mysql
->
net
.
last_errno
,
mysql
->
net
.
last_error
));
mysql
->
net
.
last_error
));
{
{
...
...
mysql-test/r/innodb.result
View file @
b3a87b58
...
@@ -1595,3 +1595,26 @@ t2 CREATE TABLE `t2` (
...
@@ -1595,3 +1595,26 @@ t2 CREATE TABLE `t2` (
CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
CONSTRAINT `t2_ibfk_2` FOREIGN KEY (`b`) REFERENCES `t1` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
) ENGINE=InnoDB DEFAULT CHARSET=latin1
drop table t2, t1;
drop table t2, t1;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 24
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 0
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 25
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
begin;
delete from t1;
commit;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 26
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
drop table t1;
mysql-test/r/rpl_relayrotate.result
View file @
b3a87b58
...
@@ -16,19 +16,4 @@ master_pos_wait('master-bin.001',3000)>=0
...
@@ -16,19 +16,4 @@ master_pos_wait('master-bin.001',3000)>=0
select * from t1 where a=8000;
select * from t1 where a=8000;
a
a
8000
8000
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 1
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
begin;
delete from t1;
commit;
show status like "binlog_cache_use";
Variable_name Value
Binlog_cache_use 2
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 1
drop table t1;
drop table t1;
mysql-test/t/
rpl_relayrotate
-master.opt
→
mysql-test/t/
innodb
-master.opt
View file @
b3a87b58
File moved
mysql-test/t/innodb.test
View file @
b3a87b58
...
@@ -1106,4 +1106,37 @@ show create table t2;
...
@@ -1106,4 +1106,37 @@ show create table t2;
drop
table
t2
,
t1
;
drop
table
t2
,
t1
;
#
# Let us test binlog_cache_use and binlog_cache_disk_use status vars.
# Actually this test has nothing to do with innodb per se, it just requires
# transactional table.
#
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
create
table
t1
(
a
int
)
engine
=
innodb
;
# Now we are going to create transaction which is long enough so its
# transaction binlog will be flushed to disk...
let
$
1
=
2000
;
disable_query_log
;
begin
;
while
(
$
1
)
{
eval
insert
into
t1
values
(
$
1
);
dec
$
1
;
}
commit
;
enable_query_log
;
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
# Transaction which should not be flushed to disk and so should not
# increase binlog_cache_disk_use.
begin
;
delete
from
t1
;
commit
;
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
drop
table
t1
;
mysql-test/t/rpl_relayrotate.test
View file @
b3a87b58
...
@@ -60,22 +60,6 @@ select * from t1 where a=8000;
...
@@ -60,22 +60,6 @@ select * from t1 where a=8000;
connection
master
;
connection
master
;
# binlog_cache_use and binlog_cache_disk_use status vars test
# This test uses the previous test. Namely, it needs the long
# transaction that adds 8000 lines to the t1 table.
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
# transaction which should not be flushed to disk and so should not
# increase binlog_cache_disk_use
begin
;
delete
from
t1
;
commit
;
show
status
like
"binlog_cache_use"
;
show
status
like
"binlog_cache_disk_use"
;
# The following DROP is a very important cleaning task:
# The following DROP is a very important cleaning task:
# imagine the next test is run with --skip-innodb: it will do
# imagine the next test is run with --skip-innodb: it will do
# DROP TABLE IF EXISTS t1; but this will delete the frm and leave
# DROP TABLE IF EXISTS t1; but this will delete the frm and leave
...
...
sql/handler.cc
View file @
b3a87b58
...
@@ -743,7 +743,7 @@ int ha_delete_table(enum db_type table_type, const char *path)
...
@@ -743,7 +743,7 @@ int ha_delete_table(enum db_type table_type, const char *path)
{
{
/* Ensure that table handler get path in lower case */
/* Ensure that table handler get path in lower case */
strmov
(
tmp_path
,
path
);
strmov
(
tmp_path
,
path
);
my_casedn_str
(
system
_charset_info
,
tmp_path
);
my_casedn_str
(
files
_charset_info
,
tmp_path
);
path
=
tmp_path
;
path
=
tmp_path
;
}
}
int
error
=
file
->
delete_table
(
path
);
int
error
=
file
->
delete_table
(
path
);
...
@@ -1247,7 +1247,7 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
...
@@ -1247,7 +1247,7 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
{
{
/* Ensure that handler gets name in lower case */
/* Ensure that handler gets name in lower case */
strmov
(
name_buff
,
name
);
strmov
(
name_buff
,
name
);
my_casedn_str
(
system
_charset_info
,
name_buff
);
my_casedn_str
(
files
_charset_info
,
name_buff
);
name
=
name_buff
;
name
=
name_buff
;
}
}
...
...
sql/sql_acl.cc
View file @
b3a87b58
...
@@ -953,7 +953,7 @@ ulong acl_get(const char *host, const char *ip,
...
@@ -953,7 +953,7 @@ ulong acl_get(const char *host, const char *ip,
end
=
strmov
((
tmp_db
=
strmov
(
strmov
(
key
,
ip
?
ip
:
""
)
+
1
,
user
)
+
1
),
db
);
end
=
strmov
((
tmp_db
=
strmov
(
strmov
(
key
,
ip
?
ip
:
""
)
+
1
,
user
)
+
1
),
db
);
if
(
lower_case_table_names
)
if
(
lower_case_table_names
)
{
{
my_casedn_str
(
&
my_charset_latin1
,
tmp_db
);
my_casedn_str
(
files_charset_info
,
tmp_db
);
db
=
tmp_db
;
db
=
tmp_db
;
}
}
key_length
=
(
uint
)
(
end
-
key
);
key_length
=
(
uint
)
(
end
-
key
);
...
@@ -1733,8 +1733,8 @@ GRANT_TABLE::GRANT_TABLE(const char *h, const char *d,const char *u,
...
@@ -1733,8 +1733,8 @@ GRANT_TABLE::GRANT_TABLE(const char *h, const char *d,const char *u,
tname
=
strdup_root
(
&
memex
,
t
);
tname
=
strdup_root
(
&
memex
,
t
);
if
(
lower_case_table_names
)
if
(
lower_case_table_names
)
{
{
my_casedn_str
(
&
my_charset_latin1
,
db
);
my_casedn_str
(
files_charset_info
,
db
);
my_casedn_str
(
&
my_charset_latin1
,
tname
);
my_casedn_str
(
files_charset_info
,
tname
);
}
}
key_length
=
(
uint
)
strlen
(
d
)
+
(
uint
)
strlen
(
u
)
+
(
uint
)
strlen
(
t
)
+
3
;
key_length
=
(
uint
)
strlen
(
d
)
+
(
uint
)
strlen
(
u
)
+
(
uint
)
strlen
(
t
)
+
3
;
hash_key
=
(
char
*
)
alloc_root
(
&
memex
,
key_length
);
hash_key
=
(
char
*
)
alloc_root
(
&
memex
,
key_length
);
...
@@ -1768,8 +1768,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs)
...
@@ -1768,8 +1768,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs)
}
}
if
(
lower_case_table_names
)
if
(
lower_case_table_names
)
{
{
my_casedn_str
(
&
my_charset_latin1
,
db
);
my_casedn_str
(
files_charset_info
,
db
);
my_casedn_str
(
&
my_charset_latin1
,
tname
);
my_casedn_str
(
files_charset_info
,
tname
);
}
}
key_length
=
((
uint
)
strlen
(
db
)
+
(
uint
)
strlen
(
user
)
+
key_length
=
((
uint
)
strlen
(
db
)
+
(
uint
)
strlen
(
user
)
+
(
uint
)
strlen
(
tname
)
+
3
);
(
uint
)
strlen
(
tname
)
+
3
);
...
@@ -2416,7 +2416,7 @@ int mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
...
@@ -2416,7 +2416,7 @@ int mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
if
(
lower_case_table_names
&&
db
)
if
(
lower_case_table_names
&&
db
)
{
{
strmov
(
tmp_db
,
db
);
strmov
(
tmp_db
,
db
);
my_casedn_str
(
&
my_charset_latin1
,
tmp_db
);
my_casedn_str
(
files_charset_info
,
tmp_db
);
db
=
tmp_db
;
db
=
tmp_db
;
}
}
...
...
sql/sql_cache.cc
View file @
b3a87b58
...
@@ -1512,13 +1512,28 @@ ulong Query_cache::init_cache()
...
@@ -1512,13 +1512,28 @@ ulong Query_cache::init_cache()
VOID
(
hash_init
(
&
queries
,
&
my_charset_bin
,
def_query_hash_size
,
0
,
0
,
VOID
(
hash_init
(
&
queries
,
&
my_charset_bin
,
def_query_hash_size
,
0
,
0
,
query_cache_query_get_key
,
0
,
0
));
query_cache_query_get_key
,
0
,
0
));
#ifndef FN_NO_CASE_SENCE
#ifndef FN_NO_CASE_SENCE
/*
If lower_case_table_names!=0 then db and table names are already
converted to lower case and we can use binary collation for their
comparison (no matter if file system case sensitive or not).
If we have case-sensitive file system (like on most Unixes) and
lower_case_table_names == 0 then we should distinguish my_table
and MY_TABLE cases and so again can use binary collation.
*/
VOID
(
hash_init
(
&
tables
,
&
my_charset_bin
,
def_table_hash_size
,
0
,
0
,
VOID
(
hash_init
(
&
tables
,
&
my_charset_bin
,
def_table_hash_size
,
0
,
0
,
query_cache_table_get_key
,
0
,
0
));
query_cache_table_get_key
,
0
,
0
));
#else
#else
// windows, OS/2 or other case insensitive file names work around
/*
On windows, OS/2, MacOS X with HFS+ or any other case insensitive
file system if lower_case_table_names!=0 we have same situation as
in previous case, but if lower_case_table_names==0 then we should
not distinguish cases (to be compatible in behavior with underlaying
file system) and so should use case insensitive collation for
comparison.
*/
VOID
(
hash_init
(
&
tables
,
VOID
(
hash_init
(
&
tables
,
lower_case_table_names
?
&
my_charset_bin
:
lower_case_table_names
?
&
my_charset_bin
:
system
_charset_info
,
files
_charset_info
,
def_table_hash_size
,
0
,
0
,
query_cache_table_get_key
,
0
,
0
));
def_table_hash_size
,
0
,
0
,
query_cache_table_get_key
,
0
,
0
));
#endif
#endif
...
...
sql/sql_db.cc
View file @
b3a87b58
...
@@ -366,7 +366,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
...
@@ -366,7 +366,7 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
{
{
/* Convert database to lower case */
/* Convert database to lower case */
strmov
(
tmp_db
,
db
);
strmov
(
tmp_db
,
db
);
my_casedn_str
(
system
_charset_info
,
tmp_db
);
my_casedn_str
(
files
_charset_info
,
tmp_db
);
db
=
tmp_db
;
db
=
tmp_db
;
}
}
...
...
sql/sql_show.cc
View file @
b3a87b58
...
@@ -422,7 +422,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path,
...
@@ -422,7 +422,7 @@ mysql_find_files(THD *thd,List<char> *files, const char *db,const char *path,
{
{
if
(
lower_case_table_names
)
if
(
lower_case_table_names
)
{
{
if
(
wild_case_compare
(
system_charset_info
,
file
->
name
,
wild
))
if
(
wild_case_compare
(
files_charset_info
,
file
->
name
,
wild
))
continue
;
continue
;
}
}
else
if
(
wild_compare
(
file
->
name
,
wild
,
0
))
else
if
(
wild_compare
(
file
->
name
,
wild
,
0
))
...
...
sql/sql_table.cc
View file @
b3a87b58
...
@@ -1395,11 +1395,11 @@ mysql_rename_table(enum db_type base,
...
@@ -1395,11 +1395,11 @@ mysql_rename_table(enum db_type base,
{
{
/* Table handler expects to get all file names as lower case */
/* Table handler expects to get all file names as lower case */
strmov
(
tmp_from
,
old_name
);
strmov
(
tmp_from
,
old_name
);
my_casedn_str
(
system
_charset_info
,
tmp_from
);
my_casedn_str
(
files
_charset_info
,
tmp_from
);
old_name
=
tmp_from
;
old_name
=
tmp_from
;
strmov
(
tmp_to
,
new_name
);
strmov
(
tmp_to
,
new_name
);
my_casedn_str
(
system
_charset_info
,
tmp_to
);
my_casedn_str
(
files
_charset_info
,
tmp_to
);
new_name
=
tmp_to
;
new_name
=
tmp_to
;
}
}
my_snprintf
(
from
,
sizeof
(
from
),
"%s/%s/%s"
,
my_snprintf
(
from
,
sizeof
(
from
),
"%s/%s/%s"
,
...
@@ -2514,10 +2514,10 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
...
@@ -2514,10 +2514,10 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
{
{
if
(
lower_case_table_names
!=
2
)
if
(
lower_case_table_names
!=
2
)
{
{
my_casedn_str
(
system
_charset_info
,
new_name_buff
);
my_casedn_str
(
files
_charset_info
,
new_name_buff
);
new_alias
=
new_name
;
// Create lower case table name
new_alias
=
new_name
;
// Create lower case table name
}
}
my_casedn_str
(
system
_charset_info
,
new_name
);
my_casedn_str
(
files
_charset_info
,
new_name
);
}
}
if
(
new_db
==
db
&&
if
(
new_db
==
db
&&
!
my_strcasecmp
(
table_alias_charset
,
new_name_buff
,
table_name
))
!
my_strcasecmp
(
table_alias_charset
,
new_name_buff
,
table_name
))
...
@@ -2880,7 +2880,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
...
@@ -2880,7 +2880,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
current_pid
,
thd
->
thread_id
);
current_pid
,
thd
->
thread_id
);
/* Safety fix for innodb */
/* Safety fix for innodb */
if
(
lower_case_table_names
)
if
(
lower_case_table_names
)
my_casedn_str
(
system
_charset_info
,
tmp_name
);
my_casedn_str
(
files
_charset_info
,
tmp_name
);
create_info
->
db_type
=
new_db_type
;
create_info
->
db_type
=
new_db_type
;
if
(
!
create_info
->
comment
)
if
(
!
create_info
->
comment
)
create_info
->
comment
=
table
->
comment
;
create_info
->
comment
=
table
->
comment
;
...
...
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