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
b96c35e7
Commit
b96c35e7
authored
Sep 16, 2010
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for make dist, 32-bit OS, and other buildbot failures
parent
13e5ef4a
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
109 additions
and
108 deletions
+109
-108
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_columns_is.result
+10
-10
mysql-test/suite/funcs_1/r/is_engines_innodb.result
mysql-test/suite/funcs_1/r/is_engines_innodb.result
+1
-1
mysql-test/suite/maria/t/compat_aliases.test
mysql-test/suite/maria/t/compat_aliases.test
+1
-0
storage/maria/CMakeLists.txt
storage/maria/CMakeLists.txt
+1
-1
storage/maria/unittest/ma_test_recovery.expected
storage/maria/unittest/ma_test_recovery.expected
+96
-96
No files found.
mysql-test/suite/funcs_1/r/is_columns_is.result
View file @
b96c35e7
...
@@ -248,19 +248,19 @@ NULL information_schema INNODB_TRX trx_requested_lock_id 4 NULL YES varchar 81 2
...
@@ -248,19 +248,19 @@ NULL information_schema INNODB_TRX trx_requested_lock_id 4 NULL YES varchar 81 2
NULL information_schema INNODB_TRX trx_started 3 0000-00-00 00:00:00 NO datetime NULL NULL NULL NULL NULL NULL datetime select
NULL information_schema INNODB_TRX trx_started 3 0000-00-00 00:00:00 NO datetime NULL NULL NULL NULL NULL NULL datetime select
NULL information_schema INNODB_TRX trx_state 2 NO varchar 13 39 NULL NULL utf8 utf8_general_ci varchar(13) select
NULL information_schema INNODB_TRX trx_state 2 NO varchar 13 39 NULL NULL utf8 utf8_general_ci varchar(13) select
NULL information_schema INNODB_TRX trx_wait_started 5 NULL YES datetime NULL NULL NULL NULL NULL NULL datetime select
NULL information_schema INNODB_TRX trx_wait_started 5 NULL YES datetime NULL NULL NULL NULL NULL NULL datetime select
NULL information_schema INNODB_TRX trx_weight 6 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema INNODB_TRX trx_weight 6 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES BLOCK_SIZE 5 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES BLOCK_SIZE 5 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES DIRTY_BLOCKS 8 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES DIRTY_BLOCKS 8 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES FULL_SIZE 4 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES FULL_SIZE 4 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES KEY_CACHE_NAME 1 NO varchar 192 576 NULL NULL utf8 utf8_general_ci varchar(192) select
NULL information_schema KEY_CACHES KEY_CACHE_NAME 1 NO varchar 192 576 NULL NULL utf8 utf8_general_ci varchar(192) select
NULL information_schema KEY_CACHES READS 10 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES READS 10 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES READ_REQUESTS 9 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES READ_REQUESTS 9 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES SEGMENTS 2 NULL YES int NULL NULL 10 0 NULL NULL int(3) unsigned select
NULL information_schema KEY_CACHES SEGMENTS 2 NULL YES int NULL NULL 10 0 NULL NULL int(3) unsigned select
NULL information_schema KEY_CACHES SEGMENT_NUMBER 3 NULL YES int NULL NULL 10 0 NULL NULL int(3) unsigned select
NULL information_schema KEY_CACHES SEGMENT_NUMBER 3 NULL YES int NULL NULL 10 0 NULL NULL int(3) unsigned select
NULL information_schema KEY_CACHES UNUSED_BLOCKS 7 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES UNUSED_BLOCKS 7 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES USED_BLOCKS 6 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES USED_BLOCKS 6 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES WRITES 12 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES WRITES 12 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES WRITE_REQUESTS 11 0 NO bigint NULL NULL
19
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_CACHES WRITE_REQUESTS 11 0 NO bigint NULL NULL
20
0 NULL NULL bigint(21) unsigned select
NULL information_schema KEY_COLUMN_USAGE COLUMN_NAME 7 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select
NULL information_schema KEY_COLUMN_USAGE COLUMN_NAME 7 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select
NULL information_schema KEY_COLUMN_USAGE CONSTRAINT_CATALOG 1 NULL YES varchar 512 1536 NULL NULL utf8 utf8_general_ci varchar(512) select
NULL information_schema KEY_COLUMN_USAGE CONSTRAINT_CATALOG 1 NULL YES varchar 512 1536 NULL NULL utf8 utf8_general_ci varchar(512) select
NULL information_schema KEY_COLUMN_USAGE CONSTRAINT_NAME 3 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select
NULL information_schema KEY_COLUMN_USAGE CONSTRAINT_NAME 3 NO varchar 64 192 NULL NULL utf8 utf8_general_ci varchar(64) select
...
...
mysql-test/suite/funcs_1/r/is_engines_innodb.result
View file @
b96c35e7
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
...
@@ -2,7 +2,7 @@ SELECT * FROM information_schema.engines
WHERE ENGINE = 'InnoDB';
WHERE ENGINE = 'InnoDB';
ENGINE InnoDB
ENGINE InnoDB
SUPPORT YES
SUPPORT YES
COMMENT
Percona-XtraDB,
Supports transactions, row-level locking, and foreign keys
COMMENT Supports transactions, row-level locking, and foreign keys
TRANSACTIONS YES
TRANSACTIONS YES
XA YES
XA YES
SAVEPOINTS YES
SAVEPOINTS YES
mysql-test/suite/maria/t/compat_aliases.test
View file @
b96c35e7
...
@@ -51,6 +51,7 @@ set session aria_sort_buffer_size=@old_sort_buffer_size;
...
@@ -51,6 +51,7 @@ set session aria_sort_buffer_size=@old_sort_buffer_size;
set
@
old_max_sort_file_size
=@@
global
.
maria_max_sort_file_size
,
set
@
old_max_sort_file_size
=@@
global
.
maria_max_sort_file_size
,
@
old_repair_threads
=@@
global
.
aria_repair_threads
;
@
old_repair_threads
=@@
global
.
aria_repair_threads
;
set
@@
global
.
maria_max_sort_file_size
=
default
,
@@
global
.
aria_repair_threads
=
default
;
set
@@
global
.
maria_max_sort_file_size
=
default
,
@@
global
.
aria_repair_threads
=
default
;
--
replace_result
4293918720
9223372036853727232
select
@@
global
.
maria_max_sort_file_size
,
@@
global
.
aria_repair_threads
;
select
@@
global
.
maria_max_sort_file_size
,
@@
global
.
aria_repair_threads
;
set
@@
global
.
aria_max_sort_file_size
=@
old_max_sort_file_size
,
set
@@
global
.
aria_max_sort_file_size
=@
old_max_sort_file_size
,
@@
global
.
maria_repair_threads
=@
old_repair_threads
;
@@
global
.
maria_repair_threads
=@
old_repair_threads
;
...
...
storage/maria/CMakeLists.txt
View file @
b96c35e7
...
@@ -43,7 +43,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c
...
@@ -43,7 +43,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c
ha_maria.cc trnman.c lockman.c tablockman.c
ha_maria.cc trnman.c lockman.c tablockman.c
ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c
ma_rt_index.c ma_rt_key.c ma_rt_mbr.c ma_rt_split.c
ma_sp_key.c ma_control_file.c ma_loghandler.c
ma_sp_key.c ma_control_file.c ma_loghandler.c
ma_pagecache.c ma_pagecaches.c
ma_pagecache.c ma_pagecaches.c
compat_aliases.cc compat_aliases.h
ma_checkpoint.c ma_recovery.c ma_commit.c ma_pagecrc.c
ma_checkpoint.c ma_recovery.c ma_commit.c ma_pagecrc.c
ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c
ha_maria.h maria_def.h ma_recovery_util.c ma_servicethread.c
)
)
...
...
storage/maria/unittest/ma_test_recovery.expected
View file @
b96c35e7
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