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

Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190

Browse Source
This commit is contained in:
He Zhenxing
2009-10-02 16:40:06 +08:00
parent 228ae2bf50
commit 4381f7ed90
4 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/include/setup_fake_relay_log.inc
View File

@ -69,7 +69,21 @@ let $_fake_relay_log_purge= `SELECT @@global.relay_log_purge`;
# Create relay log file. # Create relay log file.
copy_file $fake_relay_log $_fake_relay_log; copy_file $fake_relay_log $_fake_relay_log;
# Create relay log index. # Create relay log index.
--exec echo ./$_fake_filename-fake.000001 > $_fake_relay_index
# After patch for BUG#12190, the filename used in CHANGE MASTER
# RELAY_LOG_FILE will be automatically added the directory of the
# relay log before comparison, thus we need to added the directory
# part (./ on unix .\ on windows) when faking the relay-log-bin.index.
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
{
eval select './$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index';
}
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`)
{
eval select '.\\\\$_fake_filename-fake.000001\n' into dumpfile '$_fake_relay_index';
}
# Setup replication from existing relay log. # Setup replication from existing relay log.
eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_filename-fake.000001', RELAY_LOG_POS=4; eval CHANGE MASTER TO MASTER_HOST='dummy.localdomain', RELAY_LOG_FILE='$_fake_filename-fake.000001', RELAY_LOG_POS=4;

19
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
View File

@ -25,9 +25,22 @@ let $MYSQLD_DATADIR= `select @@datadir`;
copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLD_DATADIR/slave-relay-bin.000001; copy_file $MYSQL_TEST_DIR/std_data/bug33029-slave-relay-bin.000001 $MYSQLD_DATADIR/slave-relay-bin.000001;
write_file $MYSQLD_DATADIR/slave-relay-bin.index;
./slave-relay-bin.000001 # After patch for BUG#12190, the filename used in CHANGE MASTER
EOF # RELAY_LOG_FILE will be automatically added the directory of the
# relay log before comparison, thus we need to added the directory
# part (./ on unix .\ on windows) when faking the relay-log-bin.index.
disable_query_log;
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") = 0`)
{
eval select './slave-relay-bin.000001\n' into dumpfile '$MYSQLD_DATADIR/slave-relay-bin.index';
}
if (`select convert(@@version_compile_os using latin1) IN ("Win32","Win64","Windows") != 0`)
{
eval select '.\\\\slave-relay-bin.000001\n' into dumpfile '$MYSQLD_DATADIR/slave-relay-bin.index';
}
enable_query_log;
change master to change master to
MASTER_HOST='dummy.localdomain', MASTER_HOST='dummy.localdomain',

4
mysys/default.c
View File

@ -478,7 +478,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
res= (char**) (ptr+sizeof(alloc)); res= (char**) (ptr+sizeof(alloc));
res[0]= **argv; /* Copy program name */ res[0]= **argv; /* Copy program name */
/* set arguments separator */ /* set arguments separator */
res[1]= args_separator; res[1]= (char *)args_separator;
for (i=2 ; i < (uint) *argc ; i++) for (i=2 ; i < (uint) *argc ; i++)
res[i]=argv[0][i]; res[i]=argv[0][i];
res[i]=0; /* End pointer */ res[i]=0; /* End pointer */
@ -534,7 +534,7 @@ int my_load_defaults(const char *conf_file, const char **groups,
/* set arguments separator for arguments from config file and /* set arguments separator for arguments from config file and
command line */ command line */
res[args.elements+1]= args_separator; res[args.elements+1]= (char *)args_separator;
if (*argc) if (*argc)
memcpy((uchar*) (res+1+args.elements+1), (char*) ((*argv)+1), memcpy((uchar*) (res+1+args.elements+1), (char*) ((*argv)+1),

2
sql/log.cc
View File

@ -1901,7 +1901,7 @@ updating the index files.", max_found);
*/ */
if (((strlen(ext_buf) + (end - name)) >= FN_REFLEN)) if (((strlen(ext_buf) + (end - name)) >= FN_REFLEN))
{ {
sql_print_error("Log filename too large: %s%s (%d). \ sql_print_error("Log filename too large: %s%s (%lu). \
Please fix this by archiving old logs and updating the \ Please fix this by archiving old logs and updating the \
index files.", name, ext_buf, (strlen(ext_buf) + (end - name))); index files.", name, ext_buf, (strlen(ext_buf) + (end - name)));
error= 1; error= 1;