diff options
| author | unknown <monty@mysql.com> | 2004-03-19 18:33:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-19 18:33:38 +0200 |
| commit | 28813a9ea9b5149b7c370f616232ea60dadf852c (patch) | |
| tree | 7b70c20edffefc6a9a26014ddd3c8956f5248a2d /sql/repl_failsafe.cc | |
| parent | 67ea8aac5e9e9ae98a22aff063c48053ea68e5de (diff) | |
| download | mariadb-git-28813a9ea9b5149b7c370f616232ea60dadf852c.tar.gz | |
Added test to show bug in current union implementation
After merge fixes
Portability fixes
client/mysqltest.c:
Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row)
include/errmsg.h:
After merge fixes
mysql-test/mysql-test-run.sh:
merge fix
mysql-test/r/system_mysql_db.result:
Updated results for 4.1
mysql-test/r/union.result:
Added new test
mysql-test/t/derived.test:
Portability fix (for Mac OS X)
mysql-test/t/system_mysql_db_refs.test:
Remove warnings
mysql-test/t/union.test:
Added test to show bug in current union implementation (to be fixed in 4.1)
scripts/mysql_create_system_tables.sh:
Fix wrong column define
scripts/mysql_fix_privilege_tables.sh:
Fix for mysql-test-run
scripts/mysql_fix_privilege_tables.sql:
Merge with 4.0 to get comments.
Updated so that it works with privilege tables for MySQL 3.23.
sql/repl_failsafe.cc:
After merge fix
Diffstat (limited to 'sql/repl_failsafe.cc')
| -rw-r--r-- | sql/repl_failsafe.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 78e4e3386b2..284444090bb 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -914,8 +914,9 @@ int load_master_data(THD* thd) setting active_mi, because init_master_info() sets active_mi with defaults. */ - if (init_master_info(active_mi, master_info_file, relay_log_info_file, 0)) - send_error(&thd->net, ER_MASTER_INFO); + if (init_master_info(active_mi, master_info_file, relay_log_info_file, + 0)) + send_error(thd, ER_MASTER_INFO); strmake(active_mi->master_log_name, row[0], sizeof(active_mi->master_log_name)); active_mi->master_log_pos = strtoull(row[1], (char**) 0, 10); |