database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.0-base -> 10.0.

Browse Source 
Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
This commit is contained in:
Igor Babaev
2013-01-10 22:33:23 -08:00
parent 421bbdcf10 f853333e09
commit 1ef07d0845
156 changed files with 12024 additions and 1662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/perfschema/r/myisam_file_io.result
View File

@ -17,6 +17,7 @@ substring(object_name, locate("no_index_tab", object_name)) as short_name
from performance_schema.events_waits_history_long
where operation not like "tell"
and event_name like "wait/io/file/myisam/%"
having short_name <> ""
order by thread_id, event_id;
event_name short_source operation number_of_bytes short_name
wait/io/file/myisam/kfile mi_create.c: create NULL no_index_tab.MYI

10
mysql-test/suite/perfschema/r/pfs_upgrade.result
View File

@ -57,7 +57,7 @@ ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@ -119,7 +119,7 @@ ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@ -179,7 +179,7 @@ ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@ -239,7 +239,7 @@ ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@ -299,7 +299,7 @@ ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1591: Unexpected content found in the performance_schema database.
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name

1
mysql-test/suite/perfschema/t/myisam_file_io.test
View File

@ -46,6 +46,7 @@ select event_name,
from performance_schema.events_waits_history_long
where operation not like "tell"
and event_name like "wait/io/file/myisam/%"
having short_name <> ""
order by thread_id, event_id;
# In case of failures, this will tell if file io are lost.