diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-17 12:16:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-17 12:16:36 +0100 |
| commit | e25250160b7827e8af785e8f9deb04247b30ea06 (patch) | |
| tree | a2edf1178e0891c1aa70f3b452c8b75fa316252c /include/config-win.h | |
| parent | 463ac89d01e952d63e71cab22c94be399b05c230 (diff) | |
| parent | c61fb3c359e0712d0796937b6fed673c4409084a (diff) | |
| download | mariadb-git-e25250160b7827e8af785e8f9deb04247b30ea06.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
include/config-win.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql_client_test.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/rpl_000015.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
client/mysqltest.c:
Merge
mysql-test/mysql-test-run.pl:
Merge
Diffstat (limited to 'include/config-win.h')
| -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 4e952f8248d..e69b5d511db 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__ |