diff options
| author | joerg@trift-lap.fambruehe <> | 2005-12-15 12:10:00 +0100 |
|---|---|---|
| committer | joerg@trift-lap.fambruehe <> | 2005-12-15 12:10:00 +0100 |
| commit | 0aaec937819441fb3232e29693d99f744a38badc (patch) | |
| tree | ec3bbbd46313f26a05e457920b0679f96d23b1d6 | |
| parent | 9ca31046c7e901c2ba2a3ee79dc5bf8dce5a162a (diff) | |
| parent | 7fe1a4038c7d6bb4f0c126f6ad27095b17e72d02 (diff) | |
| download | mariadb-git-0aaec937819441fb3232e29693d99f744a38badc.tar.gz | |
Merge joerg@trift2:/M50/part3-kent-joerg
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
| -rw-r--r-- | include/my_pthread.h | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl_relayrotate.result | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 6f60a6df2c1..202e047dc4e 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -643,10 +643,10 @@ extern int pthread_dummy(int); #define THREAD_NAME_SIZE 10 #ifndef DEFAULT_THREAD_STACK -#if defined(__ia64__) +#if SIZEOF_CHARP > 4 /* MySQL can survive with 32K, but some glibc libraries require > 128K stack - To resolve hostnames + To resolve hostnames. Also recursive stored procedures needs stack. */ #define DEFAULT_THREAD_STACK (256*1024L) #else diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result index b038e7b6a3e..20f19973d83 100644 --- a/mysql-test/r/rpl_relayrotate.result +++ b/mysql-test/r/rpl_relayrotate.result @@ -10,9 +10,6 @@ reset slave; start slave; stop slave; start slave; -select master_pos_wait('master-bin.001',3000)>=0; -master_pos_wait('master-bin.001',3000)>=0 -1 select max(a) from t1; max(a) 8000 |