diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-18 02:53:21 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-18 02:53:21 +0300 |
| commit | 583160afe2a741c70f65f71b6b9cc47516e8b595 (patch) | |
| tree | e6bcb6e78efce750d0d73893bab34d46e63d19c7 /mysql-test/r/rpl000001.result | |
| parent | c8f1969e2e2e93b8aaee2998134bb53df92b7d94 (diff) | |
| download | mariadb-git-583160afe2a741c70f65f71b6b9cc47516e8b595.tar.gz | |
Don't force conf_to_src to be static an all systems
Removed unpredictable test from rpl000001.test
Docs/manual.texi:
Added some information about table locks
libmysql/Makefile.shared:
Don't force conf_to_src to be static an all systems
mysql-test/r/rpl000001.result:
Removed unpredictable test
mysql-test/t/rpl000001.test:
Removed unpredictable test
scripts/mysql_zap.sh:
Added --help
strings/ctype-ujis.c:
Removed warnings
Diffstat (limited to 'mysql-test/r/rpl000001.result')
| -rw-r--r-- | mysql-test/r/rpl000001.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index 7b10357b670..a80fb618457 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -5,8 +5,6 @@ sum(length(word)) 71 (@id := id) - id 0 -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter -127.0.0.1 root 9999 1 master-bin.001 939 No 1053 Slave: query ' update t1 set n = n + get_lock('crash_lock', 2)' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START; 0 count(*) 10 n |