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
547ef666
Commit
547ef666
authored
May 03, 2011
by
Michael Widenius
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge with MariaDB 5.1
parents
1be5462d
f7485305
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
14 additions
and
12 deletions
+14
-12
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_is.result
+2
-0
mysql-test/suite/pbxt/r/client_xml.result
mysql-test/suite/pbxt/r/client_xml.result
+3
-3
mysys/Makefile.am
mysys/Makefile.am
+3
-2
storage/xtradb/buf/buf0buddy.c
storage/xtradb/buf/buf0buddy.c
+0
-2
storage/xtradb/fil/fil0fil.c
storage/xtradb/fil/fil0fil.c
+2
-2
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+1
-1
storage/xtradb/os/os0file.c
storage/xtradb/os/os0file.c
+2
-1
unittest/mysys/bitmap-t.c
unittest/mysys/bitmap-t.c
+1
-1
No files found.
mysql-test/suite/funcs_1/r/is_columns_is.result
View file @
547ef666
...
...
@@ -226,6 +226,7 @@ NULL information_schema INNODB_SYS_INDEXES TYPE 5 0 NO bigint NULL NULL 20 0 NUL
NULL information_schema INNODB_SYS_STATS DIFF_VALS 3 0 NO bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
NULL information_schema INNODB_SYS_STATS INDEX_ID 1 0 NO bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
NULL information_schema INNODB_SYS_STATS KEY_COLS 2 0 NO bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
NULL information_schema INNODB_SYS_STATS NON_NULL_VALS 4 NULL YES bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
NULL information_schema INNODB_SYS_TABLES CLUSTER_NAME 8 NO varchar 192 576 NULL NULL utf8 utf8_general_ci varchar(192) select
NULL information_schema INNODB_SYS_TABLES ID 3 0 NO bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
NULL information_schema INNODB_SYS_TABLES MIX_ID 6 0 NO bigint NULL NULL 20 0 NULL NULL bigint(21) unsigned select
...
...
@@ -770,6 +771,7 @@ NULL information_schema INNODB_SYS_INDEXES PAGE_NO bigint NULL NULL NULL NULL bi
NULL information_schema INNODB_SYS_STATS INDEX_ID bigint NULL NULL NULL NULL bigint(21) unsigned
NULL information_schema INNODB_SYS_STATS KEY_COLS bigint NULL NULL NULL NULL bigint(21) unsigned
NULL information_schema INNODB_SYS_STATS DIFF_VALS bigint NULL NULL NULL NULL bigint(21) unsigned
NULL information_schema INNODB_SYS_STATS NON_NULL_VALS bigint NULL NULL NULL NULL bigint(21) unsigned
3.0000 information_schema INNODB_SYS_TABLES SCHEMA varchar 192 576 utf8 utf8_general_ci varchar(192)
3.0000 information_schema INNODB_SYS_TABLES NAME varchar 192 576 utf8 utf8_general_ci varchar(192)
NULL information_schema INNODB_SYS_TABLES ID bigint NULL NULL NULL NULL bigint(21) unsigned
...
...
mysql-test/suite/pbxt/r/client_xml.result
View file @
547ef666
...
...
@@ -18,9 +18,9 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="test">
<table_structure name="t1">
<field Field="a&b" Type="int(11)" Null="YES" Key="" Extra="" />
<field Field="a<b" Type="int(11)" Null="YES" Key="" Extra="" />
<field Field="a>b" Type="text" Null="YES" Key="" Extra="" />
<field Field="a&b" Type="int(11)" Null="YES" Key="" Extra=""
Comment=""
/>
<field Field="a<b" Type="int(11)" Null="YES" Key="" Extra=""
Comment=""
/>
<field Field="a>b" Type="text" Null="YES" Key="" Extra=""
Comment=""
/>
</table_structure>
<table_data name="t1">
<row>
...
...
mysys/Makefile.am
View file @
547ef666
...
...
@@ -43,7 +43,8 @@ libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
mf_wcomp.c mf_wfile.c my_gethwaddr.c
\
mf_qsort.c mf_qsort2.c mf_sort.c
\
ptr_cmp.c mf_radix.c queues.c my_getncpus.c
\
tree.c trie.c list.c hash.c array.c string.c typelib.c
\
tree.c trie.c list.c hash.c array.c string.c
\
typelib.c
\
my_copy.c my_append.c my_lib.c
\
my_delete.c my_rename.c my_redel.c
\
my_chsize.c my_clock.c
\
...
...
@@ -51,7 +52,7 @@ libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
my_sync.c my_getopt.c my_mkdir.c
\
default_modify.c default.c
\
my_compress.c checksum.c
\
my_net.c my_sleep.c
\
my_net.c my_
port.c my_
sleep.c
\
charset.c charset-def.c my_bitmap.c my_bit.c md5.c
\
rijndael.c my_aes.c sha1.c
\
my_compare.c my_netware.c my_largepage.c
\
...
...
storage/xtradb/buf/buf0buddy.c
View file @
547ef666
...
...
@@ -452,8 +452,6 @@ buf_buddy_relocate(
buf_page_t
*
bpage
;
const
ulint
size
=
BUF_BUDDY_LOW
<<
i
;
ullint
usec
=
ut_time_us
(
NULL
);
ulint
space
;
ulint
page_no
;
//ut_ad(buf_pool_mutex_own());
ut_ad
(
mutex_own
(
&
zip_free_mutex
));
...
...
storage/xtradb/fil/fil0fil.c
View file @
547ef666
...
...
@@ -691,7 +691,7 @@ fil_node_open_file(
ut_a
(
space
->
purpose
!=
FIL_LOG
);
ut_a
(
!
trx_sys_sys_space
(
space
->
id
));
if
(
size_bytes
<
FIL_IBD_FILE_INITIAL_SIZE
*
(
lint
)
UNIV_PAGE_SIZE
)
{
if
(
size_bytes
<
(
ib_uint64_t
)
(
FIL_IBD_FILE_INITIAL_SIZE
*
(
lint
)
UNIV_PAGE_SIZE
)
)
{
fprintf
(
stderr
,
"InnoDB: Error: the size of single-table"
" tablespace file %s
\n
"
...
...
@@ -3806,7 +3806,7 @@ fil_load_single_table_tablespace(
/* Align the memory for file i/o if we might have O_DIRECT set */
page
=
ut_align
(
buf2
,
UNIV_PAGE_SIZE
);
if
(
size
>=
FIL_IBD_FILE_INITIAL_SIZE
*
(
lint
)
UNIV_PAGE_SIZE
)
{
if
(
size
>=
(
ib_uint64_t
)
(
FIL_IBD_FILE_INITIAL_SIZE
*
(
lint
)
UNIV_PAGE_SIZE
)
)
{
success
=
os_file_read
(
file
,
page
,
0
,
0
,
UNIV_PAGE_SIZE
);
/* We have to read the tablespace id from the file */
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
547ef666
...
...
@@ -11794,7 +11794,7 @@ static MYSQL_SYSVAR_ULINT(pass_corrupt_table, srv_pass_corrupt_table,
"except for the deletion."
,
NULL
,
NULL
,
0
,
0
,
1
,
0
);
static
MYSQL_SYSVAR_UL
ONG
(
lazy_drop_table
,
srv_lazy_drop_table
,
static
MYSQL_SYSVAR_UL
INT
(
lazy_drop_table
,
srv_lazy_drop_table
,
PLUGIN_VAR_RQCMDARG
,
"At deleting tablespace, only miminum needed processes at the time are done. "
"e.g. for http://bugs.mysql.com/51325"
,
...
...
storage/xtradb/os/os0file.c
View file @
547ef666
...
...
@@ -3817,7 +3817,8 @@ try_again:
slot
->
pos
,
&
dummy_mess1
,
&
dummy_mess2
,
&
dummy_type
);
&
dummy_type
,
&
space_id
);
return
(
retval
);
}
...
...
unittest/mysys/bitmap-t.c
View file @
547ef666
...
...
@@ -430,7 +430,7 @@ my_bool test_intersect(MY_BITMAP *map, uint bitsize)
{
uint
bitsize2
=
1
+
get_rand_bit
(
MAX_TESTED_BITMAP_SIZE
-
1
);
MY_BITMAP
map2
;
uint32
map2buf
[
bitsize2
];
uint32
map2buf
[
MAX_TESTED_BITMAP_SIZE
];
uint
i
,
test_bit1
,
test_bit2
,
test_bit3
;
if
(
bitmap_init
(
&
map2
,
map2buf
,
bitsize2
,
FALSE
))
{
...
...
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