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
b64b1a56
Commit
b64b1a56
authored
Jun 15, 2007
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge chilla.local:/home/mydev/mysql-5.1-ateam
into chilla.local:/home/mydev/mysql-5.1-axmrg
parents
1d9c3047
f28a5842
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
111 additions
and
13 deletions
+111
-13
mysql-test/r/csv.result
mysql-test/r/csv.result
+21
-0
mysql-test/r/merge.result
mysql-test/r/merge.result
+4
-4
mysql-test/r/show_check.result
mysql-test/r/show_check.result
+2
-0
mysql-test/t/csv.test
mysql-test/t/csv.test
+21
-0
mysql-test/t/show_check.test
mysql-test/t/show_check.test
+6
-0
sql/mysql_priv.h
sql/mysql_priv.h
+4
-0
sql/sql_plugin.cc
sql/sql_plugin.cc
+22
-0
sql/sql_table.cc
sql/sql_table.cc
+0
-4
sql/table.cc
sql/table.cc
+17
-2
storage/csv/ha_tina.cc
storage/csv/ha_tina.cc
+2
-2
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.cc
+12
-1
No files found.
mysql-test/r/csv.result
View file @
b64b1a56
...
...
@@ -5203,6 +5203,27 @@ select * from bug15205;
val
drop table bug15205;
drop table bug15205_2;
set names latin1;
create table t1 (
c varchar(1),
name varchar(64)
) character set latin1 engine=csv;
insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE');
insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE');
insert into t1 values (0xEE,'LATIN SMALL LETTER I WITH CIRCUMFLEX');
insert into t1 values (0xFE,'LATIN SMALL LETTER THORN');
insert into t1 values (0xF7,'DIVISION SIGN');
insert into t1 values (0xFF,'LATIN SMALL LETTER Y WITH DIAERESIS');
select hex(c), c, name from t1 order by 1;
hex(c) c name
C0 LATIN CAPITAL LETTER A WITH GRAVE
E0 LATIN SMALL LETTER A WITH GRAVE
EE LATIN SMALL LETTER I WITH CIRCUMFLEX
F7 DIVISION SIGN
FE LATIN SMALL LETTER THORN
FF LATIN SMALL LETTER Y WITH DIAERESIS
drop table t1;
End of 5.0 tests
create table bug22080_1 (id int,string varchar(64)) Engine=CSV;
create table bug22080_2 (id int,string varchar(64)) Engine=CSV;
create table bug22080_3 (id int,string varchar(64)) Engine=CSV;
...
...
mysql-test/r/merge.result
View file @
b64b1a56
...
...
@@ -852,8 +852,8 @@ SELECT * FROM tm1;
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
CHECK TABLE tm1;
Table Op Msg_type Msg_text
test.tm1 check Error Table '
./test/
t1' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Table '
./test/
t2' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Table '
test.
t1' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Table '
test.
t2' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check error Corrupt
CREATE TABLE t1(a INT);
...
...
@@ -861,7 +861,7 @@ SELECT * FROM tm1;
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
CHECK TABLE tm1;
Table Op Msg_type Msg_text
test.tm1 check Error Table '
./test/
t2' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Table '
test.
t2' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check error Corrupt
CREATE TABLE t2(a BLOB);
...
...
@@ -869,7 +869,7 @@ SELECT * FROM tm1;
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
CHECK TABLE tm1;
Table Op Msg_type Msg_text
test.tm1 check Error Table '
./test/
t2' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Table '
test.
t2' is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check Error Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
test.tm1 check error Corrupt
ALTER TABLE t2 MODIFY a INT;
...
...
mysql-test/r/show_check.result
View file @
b64b1a56
...
...
@@ -752,4 +752,6 @@ Tables_in_test Table_type
été BASE TABLE
drop table `été`;
set names latin1;
show columns from `#mysql50#????????`;
Got one of the listed errors
End of 5.1 tests
mysql-test/t/csv.test
View file @
b64b1a56
...
...
@@ -1596,6 +1596,27 @@ select * from bug15205;
drop table bug15205;
drop table bug15205_2;
#
# Bug#28862 "
Extended
Latin1
characters
get
lost
in
CVS
engine
"
#
set names latin1;
create table t1 (
c varchar(1),
name varchar(64)
) character set latin1 engine=csv;
insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE');
insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE');
insert into t1 values (0xEE,'LATIN SMALL LETTER I WITH CIRCUMFLEX');
insert into t1 values (0xFE,'LATIN SMALL LETTER THORN');
insert into t1 values (0xF7,'DIVISION SIGN');
insert into t1 values (0xFF,'LATIN SMALL LETTER Y WITH DIAERESIS');
select hex(c), c, name from t1 order by 1;
drop table t1;
--echo End of 5.0 tests
#
# Bug#22080 "
CHECK
fails
to
identify
some
corruption
"
#
...
...
mysql-test/t/show_check.test
View file @
b64b1a56
...
...
@@ -593,4 +593,10 @@ show full tables;
drop
table
`été`
;
set
names
latin1
;
#
# Bug#26402 Server crashes with old-style named table
#
--
error
ER_NO_SUCH_TABLE
,
ER_FILE_NOT_FOUND
show
columns
from
`#mysql50#????????`
;
--
echo
End
of
5.1
tests
sql/mysql_priv.h
View file @
b64b1a56
...
...
@@ -1920,6 +1920,10 @@ uint filename_to_tablename(const char *from, char *to, uint to_length);
uint
tablename_to_filename
(
const
char
*
from
,
char
*
to
,
uint
to_length
);
uint
build_table_filename
(
char
*
buff
,
size_t
bufflen
,
const
char
*
db
,
const
char
*
table
,
const
char
*
ext
,
uint
flags
);
#define MYSQL50_TABLE_NAME_PREFIX "#mysql50#"
#define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9
/* Flags for conversion functions. */
#define FN_FROM_IS_TMP (1 << 0)
#define FN_TO_IS_TMP (1 << 1)
...
...
sql/sql_plugin.cc
View file @
b64b1a56
...
...
@@ -210,6 +210,11 @@ static void reap_plugins(void);
/* declared in set_var.cc */
extern
sys_var
*
intern_find_sys_var
(
const
char
*
str
,
uint
length
,
bool
no_error
);
#ifdef EMBEDDED_LIBRARY
/* declared in sql_base.cc */
extern
bool
check_if_table_exists
(
THD
*
thd
,
TABLE_LIST
*
table
,
bool
*
exists
);
#endif
/* EMBEDDED_LIBRARY */
/****************************************************************************
Value type thunks, allows the C world to play in the C++ world
...
...
@@ -1307,6 +1312,9 @@ static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv)
READ_RECORD
read_record_info
;
int
error
;
THD
*
new_thd
;
#ifdef EMBEDDED_LIBRARY
bool
table_exists
;
#endif
/* EMBEDDED_LIBRARY */
DBUG_ENTER
(
"plugin_load"
);
if
(
!
(
new_thd
=
new
THD
))
...
...
@@ -1323,6 +1331,20 @@ static void plugin_load(MEM_ROOT *tmp_root, int *argc, char **argv)
tables
.
alias
=
tables
.
table_name
=
(
char
*
)
"plugin"
;
tables
.
lock_type
=
TL_READ
;
tables
.
db
=
new_thd
->
db
;
#ifdef EMBEDDED_LIBRARY
/*
When building an embedded library, if the mysql.plugin table
does not exist, we silently ignore the missing table
*/
pthread_mutex_lock
(
&
LOCK_open
);
if
(
check_if_table_exists
(
new_thd
,
&
tables
,
&
table_exists
))
table_exists
=
FALSE
;
pthread_mutex_unlock
(
&
LOCK_open
);
if
(
!
table_exists
)
goto
end
;
#endif
/* EMBEDDED_LIBRARY */
if
(
simple_open_n_lock_tables
(
new_thd
,
&
tables
))
{
DBUG_PRINT
(
"error"
,(
"Can't open plugin table"
));
...
...
sql/sql_table.cc
View file @
b64b1a56
...
...
@@ -54,10 +54,6 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
HA_CREATE_INFO
*
create_info
,
Alter_info
*
alter_info
);
#define MYSQL50_TABLE_NAME_PREFIX "#mysql50#"
#define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9
/*
Translate a file name to a table name (WL #1324).
...
...
sql/table.cc
View file @
b64b1a56
...
...
@@ -343,10 +343,25 @@ int open_table_def(THD *thd, TABLE_SHARE *share, uint db_flags)
strxmov
(
path
,
share
->
normalized_path
.
str
,
reg_ext
,
NullS
);
if
((
file
=
my_open
(
path
,
O_RDONLY
|
O_SHARE
,
MYF
(
0
)))
<
0
)
{
if
(
strchr
(
share
->
table_name
.
str
,
'@'
))
/*
We don't try to open 5.0 unencoded name, if
- non-encoded name contains '@' signs,
because '@' can be misinterpreted.
It is not clear if '@' is escape character in 5.1,
or a normal character in 5.0.
- non-encoded db or table name contain "#mysql50#" prefix.
This kind of tables must have been opened only by the
my_open() above.
*/
if
(
strchr
(
share
->
table_name
.
str
,
'@'
)
||
!
strncmp
(
share
->
db
.
str
,
MYSQL50_TABLE_NAME_PREFIX
,
MYSQL50_TABLE_NAME_PREFIX_LENGTH
)
||
!
strncmp
(
share
->
table_name
.
str
,
MYSQL50_TABLE_NAME_PREFIX
,
MYSQL50_TABLE_NAME_PREFIX_LENGTH
))
goto
err_not_open
;
/* Try unecoded 5.0 name */
/* Try une
n
coded 5.0 name */
uint
length
;
strxnmov
(
path
,
sizeof
(
path
)
-
1
,
mysql_data_home
,
"/"
,
share
->
db
.
str
,
"/"
,
...
...
storage/csv/ha_tina.cc
View file @
b64b1a56
...
...
@@ -444,7 +444,7 @@ ha_tina::ha_tina(handlerton *hton, TABLE_SHARE *table_arg)
records_is_known
(
0
)
{
/* Set our original buffers from pre-allocated memory */
buffer
.
set
((
char
*
)
byte_buffer
,
IO_SIZE
,
system_charset_info
);
buffer
.
set
((
char
*
)
byte_buffer
,
IO_SIZE
,
&
my_charset_bin
);
chain
=
chain_buffer
;
file_buff
=
new
Transparent_file
();
}
...
...
@@ -679,7 +679,7 @@ int ha_tina::find_current_row(uchar *buf)
}
if
(
bitmap_is_set
(
table
->
read_set
,
(
*
field
)
->
field_index
))
(
*
field
)
->
store
(
buffer
.
ptr
(),
buffer
.
length
(),
system_charset_info
);
(
*
field
)
->
store
(
buffer
.
ptr
(),
buffer
.
length
(),
buffer
.
charset
()
);
}
next_position
=
end_offset
+
eoln_len
;
error
=
0
;
...
...
storage/myisammrg/ha_myisammrg.cc
View file @
b64b1a56
...
...
@@ -52,11 +52,22 @@ extern int check_definition(MI_KEYDEF *t1_keyinfo, MI_COLUMNDEF *t1_recinfo,
uint
t1_keys
,
uint
t1_recs
,
MI_KEYDEF
*
t2_keyinfo
,
MI_COLUMNDEF
*
t2_recinfo
,
uint
t2_keys
,
uint
t2_recs
,
bool
strict
);
static
void
split_file_name
(
const
char
*
file_name
,
LEX_STRING
*
db
,
LEX_STRING
*
name
);
extern
"C"
void
myrg_print_wrong_table
(
const
char
*
table_name
)
{
LEX_STRING
db
,
name
;
char
buf
[
FN_REFLEN
];
split_file_name
(
table_name
,
&
db
,
&
name
);
memcpy
(
buf
,
db
.
str
,
db
.
length
);
buf
[
db
.
length
]
=
'.'
;
memcpy
(
buf
+
db
.
length
+
1
,
name
.
str
,
name
.
length
);
buf
[
db
.
length
+
name
.
length
+
1
]
=
0
;
push_warning_printf
(
current_thd
,
MYSQL_ERROR
::
WARN_LEVEL_ERROR
,
ER_ADMIN_WRONG_MRG_TABLE
,
ER
(
ER_ADMIN_WRONG_MRG_TABLE
),
table_name
);
buf
);
}
...
...
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