diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-17 14:02:28 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-17 14:02:28 +0300 |
| commit | da32f4030fd99036323b7205f01a3040ef09e3b4 (patch) | |
| tree | 2feb7d4406cc5558be41ea402576222b0ff9e4fc /mysql-test | |
| parent | 56614e1d19f36846a27501fb29282e70b248e06e (diff) | |
| download | mariadb-git-da32f4030fd99036323b7205f01a3040ef09e3b4.tar.gz | |
Fixed that -ldl is not used for clients
Fixed rpl000001 to handle the most common mysql-test-run ports.
configure.in:
Fixed that -ldl is not used for clients
(The old version breaked when client was compiled staticly)
mysql-test/r/rpl000001.result:
Fix to handle the most common mysql-test-run ports.
mysql-test/t/rpl000001.test:
Fix to handle the most common mysql-test-run ports.
mysys/my_alloc.c:
Extended min block a little to get faster mallocs
scripts/mysql_install_db.sh:
Fixed bug when using RPM and one had --basedir in my.cnf
sql/Makefile.am:
Add -ldl to mysqld link line
strings/ctype-ujis.c:
Remove warnings
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl000001.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl000001.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result index ad03b514fae..7b10357b670 100644 --- a/mysql-test/r/rpl000001.result +++ b/mysql-test/r/rpl000001.result @@ -6,7 +6,7 @@ sum(length(word)) (@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 9306 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 +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 diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test index 06b5d92fc8e..6f48daf7e08 100644 --- a/mysql-test/t/rpl000001.test +++ b/mysql-test/t/rpl000001.test @@ -59,6 +59,7 @@ connection slave; sync_with_master ; #give the slave a chance to exit sleep 0.5; +--replace_result 9306 9999 3334 9999 3335 9999 show slave status; set sql_slave_skip_counter=1; slave start; |