Below is the list of changes that have just been committed into a local
6.0 repository of cbell. When cbell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-11-30 01:02:04-05:00, cbell@mysql_cab_desk. +10 -0
WL#4116 : Online Backup: Record Online Backup Progress
Minor fixes to tests after merge of mysql-6.0-rpl-merge and main.
mysql-test/r/1st.result@stripped, 2007-11-30 01:01:52-05:00, cbell@mysql_cab_desk. +2 -0
WL#4116 : Online Backup: Record Online Backup Progress
New result file from adding progress tables.
mysql-test/r/connect.result@stripped, 2007-11-30 01:01:53-05:00, cbell@mysql_cab_desk. +6 -0
WL#4116 : Online Backup: Record Online Backup Progress
New result file from adding progress tables.
mysql-test/r/information_schema.result@stripped, 2007-11-30 01:01:54-05:00, cbell@mysql_cab_desk. +8 -1
WL#4116 : Online Backup: Record Online Backup Progress
New result file from adding progress tables.
mysql-test/r/mysql_upgrade.result@stripped, 2007-11-30 01:01:55-05:00, cbell@mysql_cab_desk. +8 -0
WL#4116 : Online Backup: Record Online Backup Progress
New result file from adding progress tables.
mysql-test/r/mysqlcheck.result@stripped, 2007-11-30 01:01:55-05:00, cbell@mysql_cab_desk. +4 -0
WL#4116 : Online Backup: Record Online Backup Progress
New result file from adding progress tables.
mysql-test/r/system_mysql_db.result@stripped, 2007-11-30 01:01:56-05:00, cbell@mysql_cab_desk. +2 -0
WL#4116 : Online Backup: Record Online Backup Progress
New result file from adding progress tables.
mysql-test/t/system_mysql_db_fix30020.test@stripped, 2007-11-30 01:01:57-05:00, cbell@mysql_cab_desk. +2 -1
WL#4116 : Online Backup: Record Online Backup Progress
Added progress tables to test for cleanup.
mysql-test/t/system_mysql_db_fix40123.test@stripped, 2007-11-30 01:01:58-05:00, cbell@mysql_cab_desk. +1 -1
WL#4116 : Online Backup: Record Online Backup Progress
Added progress tables to test for cleanup.
mysql-test/t/system_mysql_db_fix50030.test@stripped, 2007-11-30 01:01:58-05:00, cbell@mysql_cab_desk. +1 -1
WL#4116 : Online Backup: Record Online Backup Progress
Added progress tables to test for cleanup.
mysql-test/t/system_mysql_db_fix50117.test@stripped, 2007-11-30 01:01:59-05:00, cbell@mysql_cab_desk. +1 -1
WL#4116 : Online Backup: Record Online Backup Progress
Added progress tables to test for cleanup.
diff -Nrup a/mysql-test/r/1st.result b/mysql-test/r/1st.result
--- a/mysql-test/r/1st.result 2006-12-08 22:27:52 -05:00
+++ b/mysql-test/r/1st.result 2007-11-30 01:01:52 -05:00
@@ -16,6 +16,8 @@ help_relation
help_topic
host
ndb_binlog_index
+online_backup
+online_backup_progress
plugin
proc
procs_priv
diff -Nrup a/mysql-test/r/connect.result b/mysql-test/r/connect.result
--- a/mysql-test/r/connect.result 2006-12-08 22:27:52 -05:00
+++ b/mysql-test/r/connect.result 2007-11-30 01:01:53 -05:00
@@ -12,6 +12,8 @@ help_relation
help_topic
host
ndb_binlog_index
+online_backup
+online_backup_progress
plugin
proc
procs_priv
@@ -45,6 +47,8 @@ help_relation
help_topic
host
ndb_binlog_index
+online_backup
+online_backup_progress
plugin
proc
procs_priv
@@ -86,6 +90,8 @@ help_relation
help_topic
host
ndb_binlog_index
+online_backup
+online_backup_progress
plugin
proc
procs_priv
diff -Nrup a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
--- a/mysql-test/r/information_schema.result 2007-11-21 15:18:59 -05:00
+++ b/mysql-test/r/information_schema.result 2007-11-30 01:01:54 -05:00
@@ -74,6 +74,8 @@ help_keyword
help_relation
help_topic
host
+online_backup
+online_backup_progress
plugin
proc
procs_priv
@@ -805,6 +807,11 @@ event execute_at datetime
event last_executed datetime
event starts datetime
event ends datetime
+online_backup validity_point_time datetime
+online_backup start_time datetime
+online_backup stop_time datetime
+online_backup_progress start_time datetime
+online_backup_progress stop_time datetime
SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES A
WHERE NOT EXISTS
(SELECT * FROM INFORMATION_SCHEMA.COLUMNS B
@@ -855,7 +862,7 @@ flush privileges;
SELECT table_schema, count(*) FROM information_schema.TABLES where table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
table_schema count(*)
information_schema 28
-mysql 22
+mysql 24
create table t1 (i int, j int);
create trigger trg1 before insert on t1 for each row
begin
diff -Nrup a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result
--- a/mysql-test/r/mysql_upgrade.result 2007-08-27 05:27:02 -04:00
+++ b/mysql-test/r/mysql_upgrade.result 2007-11-30 01:01:55 -05:00
@@ -12,6 +12,8 @@ mysql.help_relation
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
+mysql.online_backup OK
+mysql.online_backup_progress OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
@@ -42,6 +44,8 @@ mysql.help_relation
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
+mysql.online_backup OK
+mysql.online_backup_progress OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
@@ -72,6 +76,8 @@ mysql.help_relation
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
+mysql.online_backup OK
+mysql.online_backup_progress OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
@@ -104,6 +110,8 @@ mysql.help_relation
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
+mysql.online_backup OK
+mysql.online_backup_progress OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
diff -Nrup a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
--- a/mysql-test/r/mysqlcheck.result 2007-01-26 20:46:39 -05:00
+++ b/mysql-test/r/mysqlcheck.result 2007-11-30 01:01:55 -05:00
@@ -13,6 +13,8 @@ mysql.help_relation
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
+mysql.online_backup OK
+mysql.online_backup_progress OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
@@ -38,6 +40,8 @@ mysql.help_relation
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
+mysql.online_backup OK
+mysql.online_backup_progress OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
diff -Nrup a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result
--- a/mysql-test/r/system_mysql_db.result 2007-10-19 16:03:16 -04:00
+++ b/mysql-test/r/system_mysql_db.result 2007-11-30 01:01:56 -05:00
@@ -12,6 +12,8 @@ help_relation
help_topic
host
ndb_binlog_index
+online_backup
+online_backup_progress
plugin
proc
procs_priv
diff -Nrup a/mysql-test/t/system_mysql_db_fix30020.test b/mysql-test/t/system_mysql_db_fix30020.test
--- a/mysql-test/t/system_mysql_db_fix30020.test 2007-04-04 09:43:01 -04:00
+++ b/mysql-test/t/system_mysql_db_fix30020.test 2007-11-30 01:01:57 -05:00
@@ -101,7 +101,8 @@ INSERT INTO user VALUES ('localhost','',
DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv,
procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc,
time_zone, time_zone_leap_second, time_zone_name, time_zone_transition,
-time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
+time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index,
+online_backup, online_backup_progress;
-- enable_query_log
diff -Nrup a/mysql-test/t/system_mysql_db_fix40123.test b/mysql-test/t/system_mysql_db_fix40123.test
--- a/mysql-test/t/system_mysql_db_fix40123.test 2007-05-24 02:44:15 -04:00
+++ b/mysql-test/t/system_mysql_db_fix40123.test 2007-11-30 01:01:58 -05:00
@@ -76,7 +76,7 @@ CREATE TABLE time_zone_leap_second ( T
-- disable_query_log
# Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, online_backup, online_backup_progress;
-- enable_query_log
diff -Nrup a/mysql-test/t/system_mysql_db_fix50030.test b/mysql-test/t/system_mysql_db_fix50030.test
--- a/mysql-test/t/system_mysql_db_fix50030.test 2007-05-05 16:03:13 -04:00
+++ b/mysql-test/t/system_mysql_db_fix50030.test 2007-11-30 01:01:58 -05:00
@@ -75,7 +75,7 @@ INSERT INTO servers VALUES ('test','loca
-- disable_query_log
# Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, online_backup, online_backup_progress;
-- enable_query_log
diff -Nrup a/mysql-test/t/system_mysql_db_fix50117.test b/mysql-test/t/system_mysql_db_fix50117.test
--- a/mysql-test/t/system_mysql_db_fix50117.test 2007-06-20 17:35:56 -04:00
+++ b/mysql-test/t/system_mysql_db_fix50117.test 2007-11-30 01:01:59 -05:00
@@ -94,7 +94,7 @@ CREATE TABLE IF NOT EXISTS ndb_binlog_in
-- disable_query_log
# Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, online_backup, online_backup_progress;
-- enable_query_log
| Thread |
|---|
| • bk commit into 6.0 tree (cbell:1.2705) WL#4116 | cbell | 30 Nov |
