diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-21 09:40:18 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-21 09:40:18 +0100 |
| commit | 75b9387904045f5846809743df9273bdf97c043b (patch) | |
| tree | 356195e0caa7d24d6aa7ef2f914497bcec391ff8 /include | |
| parent | 5937768cf2020a20cf1490b0ba4955d18f48ea86 (diff) | |
| parent | 24d77e97fa8270482e2810cea4422390f7882b2e (diff) | |
| download | mariadb-git-75b9387904045f5846809743df9273bdf97c043b.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
client/mysqltest.c:
Merge
mysql-test/mysql-test-run.pl:
Merge, undo removal
mysql-test/t/mysqldump.test:
Merge
mysql-test/t/mysqltest.test:
Merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index b2bd63efc30..cccd660efec 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -211,7 +211,7 @@ typedef uint rf_SetTimer; #define my_sigset(A,B) signal((A),(B)) #define finite(A) _finite(A) #define sleep(A) Sleep((A)*1000) -#define popen(A) popen(A,B) _popen((A),(B)) +#define popen(A,B) _popen((A),(B)) #define pclose(A) _pclose(A) #ifndef __BORLANDC__ |