Below is the list of changes that have just been committed into a local
5.1 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-06-12 13:43:09-04:00, cbell@stripped +5 -0
Merge cbell@stripped:/home/bk/mysql-5.1-backup-prototype
into suse.vabb.com:/home/Chuck/source/mysql-5.1-backup-prototype
MERGE: 1.2525.2.2
sql/backup/data_backup.cc@stripped, 2007-06-12 13:41:50-04:00, Chuck@stripped +0 -15
Manual merge to update Chuck's local repository.
MERGE: 1.15.2.1
sql/mysql_priv.h@stripped, 2007-06-12 13:41:50-04:00, Chuck@stripped +0 -1
Manual merge to update Chuck's local repository.
MERGE: 1.478.1.1
sql/mysqld.cc@stripped, 2007-06-12 13:41:50-04:00, Chuck@stripped +0 -2
Manual merge to update Chuck's local repository.
MERGE: 1.612.1.1
sql/set_var.cc@stripped, 2007-06-12 13:41:50-04:00, Chuck@stripped +0 -2
Manual merge to update Chuck's local repository.
MERGE: 1.217.1.1
sql/sql_yacc.yy@stripped, 2007-06-12 13:37:50-04:00, Chuck@stripped +0 -0
Auto merged
MERGE: 1.547.1.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: cbell
# Host: suse.vabb.com
# Root: /home/Chuck/source/mysql-5.1-backup-prototype/RESYNC
--- 1.479/sql/mysql_priv.h 2007-05-28 10:38:06 -04:00
+++ 1.480/sql/mysql_priv.h 2007-06-12 13:41:50 -04:00
@@ -1604,7 +1604,9 @@
extern ulong opt_binlog_rows_event_max_size;
extern ulong rpl_recovery_rank, thread_cache_size, thread_pool_size;
extern ulong back_log;
+#ifndef DBUG_OFF
extern ulong backup_sleep;
+#endif
extern ulong specialflag, current_pid;
extern ulong expire_logs_days, sync_binlog_period, sync_binlog_counter;
extern ulong opt_tc_log_size, tc_log_max_pages_used, tc_log_page_size;
--- 1.613/sql/mysqld.cc 2007-05-28 10:38:06 -04:00
+++ 1.614/sql/mysqld.cc 2007-06-12 13:41:50 -04:00
@@ -452,7 +452,9 @@
my_bool opt_noacl;
my_bool sp_automatic_privileges= 1;
+#ifndef DBUG_OFF
ulong backup_sleep= 0;
+#endif
ulong opt_binlog_rows_event_max_size;
const char *binlog_format_names[]= {"STATEMENT", "ROW", "MIXED", NullS};
--- 1.548/sql/sql_yacc.yy 2007-05-10 18:20:24 -04:00
+++ 1.549/sql/sql_yacc.yy 2007-06-12 13:37:50 -04:00
@@ -5582,14 +5582,14 @@
restore:
- RESTORE_SYM DATABASE
+ RESTORE_SYM
{
Lex->sql_command = SQLCOM_RESTORE;
Lex->db_list.empty();
}
/*database_list*/ FROM TEXT_STRING_sys
{
- Lex->backup_dir = $5;
+ Lex->backup_dir = $4;
};
backup:
--- 1.218/sql/set_var.cc 2007-05-28 10:38:06 -04:00
+++ 1.219/sql/set_var.cc 2007-06-12 13:41:50 -04:00
@@ -482,7 +482,9 @@
sys_var_bool_ptr sys_timed_mutexes("timed_mutexes",
&timed_mutexes);
sys_var_const_str sys_version("version", server_version);
-sys_var_long_ptr sys_backup_sleep("backup_sleep", &backup_sleep);
+#ifndef DBUG_OFF
+sys_var_long_ptr sys_backup_sleep("backup_sleep", &backup_sleep);
+#endif
sys_var_const_str sys_version_comment("version_comment",
MYSQL_COMPILATION_COMMENT);
sys_var_const_str sys_version_compile_machine("version_compile_machine",
@@ -743,7 +745,9 @@
{"auto_increment_offset", (char*) &sys_auto_increment_offset, SHOW_SYS},
{sys_automatic_sp_privileges.name,(char*) &sys_automatic_sp_privileges, SHOW_SYS},
{"back_log", (char*) &back_log, SHOW_LONG},
- {sys_backup_sleep.name, (char*) &sys_backup_sleep, SHOW_SYS},
+#ifndef DBUG_OFF
+ {sys_backup_sleep.name, (char*) &sys_backup_sleep, SHOW_SYS},
+#endif
{sys_basedir.name, (char*) &sys_basedir, SHOW_SYS},
{sys_binlog_cache_size.name,(char*) &sys_binlog_cache_size, SHOW_SYS},
{sys_binlog_format.name, (char*) &sys_binlog_format, SHOW_SYS},
--- 1.18/sql/backup/data_backup.cc 2007-05-29 13:52:53 -04:00
+++ 1.19/sql/backup/data_backup.cc 2007-06-12 13:41:50 -04:00
@@ -873,14 +873,15 @@
DBUG_ASSERT(m_buf_head);
+#ifndef DBUG_OFF
/*
If the global variable "backup_sleep" has been set, use that value
to cause the kernel to sleep in seconds.
*/
if (backup_sleep)
sleep(backup_sleep);
+#endif
- result_t res= m_drv->get_data(m_buf);
switch (res) {
@@ -1073,12 +1074,14 @@
break;
}
+#ifndef DBUG_OFF
/*
If the global variable "backup_sleep" has been set, use that value
to cause the kernel to sleep in seconds.
*/
if (backup_sleep)
sleep(backup_sleep);
+#endif
switch( drv[img_no-1]->send_data(buf) ) {
| Thread |
|---|
| • bk commit into 5.1 tree (cbell:1.2536) | cbell | 12 Jun |
