Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
9795796e
Commit
9795796e
authored
Aug 23, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
1a4532e3
f28a73f5
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
279 additions
and
43 deletions
+279
-43
VC++Files/client/mysqltest.dsp
VC++Files/client/mysqltest.dsp
+6
-6
VC++Files/mysql-test/mysql_test_run_new.dsp
VC++Files/mysql-test/mysql_test_run_new.dsp
+4
-4
VC++Files/sql/mysqld.dsp
VC++Files/sql/mysqld.dsp
+15
-7
mysql-test/include/have_lowercase0.inc
mysql-test/include/have_lowercase0.inc
+4
-0
mysql-test/include/ps_conv.inc
mysql-test/include/ps_conv.inc
+16
-0
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+50
-19
mysql-test/lib/mtr_report.pl
mysql-test/lib/mtr_report.pl
+8
-1
mysql-test/lib/mtr_timer.pl
mysql-test/lib/mtr_timer.pl
+127
-0
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+27
-3
mysys/charset.c
mysys/charset.c
+19
-0
sql/examples/ha_archive.cc
sql/examples/ha_archive.cc
+1
-1
sql/examples/ha_archive.h
sql/examples/ha_archive.h
+1
-1
sql/examples/ha_example.cc
sql/examples/ha_example.cc
+1
-1
No files found.
VC++Files/client/mysqltest.dsp
View file @
9795796e
...
@@ -42,8 +42,8 @@ RSC=rc.exe
...
@@ -42,8 +42,8 @@ RSC=rc.exe
# PROP Output_Dir ".\debug"
# PROP Output_Dir ".\debug"
# PROP Intermediate_Dir ".\debug"
# PROP Intermediate_Dir ".\debug"
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
# ADD BASE CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /
FD /
c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../regex" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_WINDOWS" /D "_MBCS" /Fp".\debug/mysqltest.pch" /Fo".\debug/" /Fd".\debug/" /GZ /
FD /
c /GX
# ADD BASE MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
# ADD BASE MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\debug\mysqltest.tlb" /win32
# ADD BASE RSC /l 1033 /d "_DEBUG"
# ADD BASE RSC /l 1033 /d "_DEBUG"
...
@@ -67,8 +67,8 @@ LINK32=link.exe
...
@@ -67,8 +67,8 @@ LINK32=link.exe
# PROP Output_Dir ".\classic"
# PROP Output_Dir ".\classic"
# PROP Intermediate_Dir ".\classic"
# PROP Intermediate_Dir ".\classic"
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX
# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /
FD /
c /GX
# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /c /GX
# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "_CONSOLE" /D "_WINDOWS" /D "LICENSE=Commercial" /D "DBUG_OFF" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\classic/mysqltest.pch" /Fo".\classic/" /Fd".\classic/" /
FD /
c /GX
# ADD BASE MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
# ADD BASE MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
# ADD BASE RSC /l 1033 /d "NDEBUG"
# ADD BASE RSC /l 1033 /d "NDEBUG"
...
@@ -92,8 +92,8 @@ LINK32=link.exe
...
@@ -92,8 +92,8 @@ LINK32=link.exe
# PROP Output_Dir ".\release"
# PROP Output_Dir ".\release"
# PROP Intermediate_Dir ".\release"
# PROP Intermediate_Dir ".\release"
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX
# ADD BASE CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /
FD /
c /GX
# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /c /GX
# ADD CPP /nologo /MT /I "../include" /I "../regex" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_CONSOLE" /D "_WINDOWS" /D "NDEBUG" /D "_MBCS" /GF /Gy /Fp".\release/mysqltest.pch" /Fo".\release/" /Fd".\release/" /
FD /
c /GX
# ADD BASE MTL /nologo /tlb".\release\mysqltest.tlb" /win32
# ADD BASE MTL /nologo /tlb".\release\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\release\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\release\mysqltest.tlb" /win32
# ADD BASE RSC /l 1033 /d "NDEBUG"
# ADD BASE RSC /l 1033 /d "NDEBUG"
...
...
VC++Files/mysql-test/mysql_test_run_new.dsp
View file @
9795796e
...
@@ -41,8 +41,8 @@ RSC=rc.exe
...
@@ -41,8 +41,8 @@ RSC=rc.exe
# PROP Output_Dir ".\Debug"
# PROP Output_Dir ".\Debug"
# PROP Intermediate_Dir ".\Debug"
# PROP Intermediate_Dir ".\Debug"
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_test_run_new.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_test_run_new.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /
FD /
c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_test_run_new.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_test_run_new.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /
FD /
c /GX
# ADD BASE MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /win32
# ADD BASE MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /win32
# ADD MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /win32
# ADD MTL /nologo /tlb".\Debug\mysql_test_run_new.tlb" /win32
# ADD BASE RSC /l 1033
# ADD BASE RSC /l 1033
...
@@ -66,8 +66,8 @@ LINK32=link.exe
...
@@ -66,8 +66,8 @@ LINK32=link.exe
# PROP Output_Dir ".\Release"
# PROP Output_Dir ".\Release"
# PROP Intermediate_Dir ".\Release"
# PROP Intermediate_Dir ".\Release"
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_test_run_new.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_test_run_new.pch" /Fo".\Release/" /Fd".\Release/" /
FD /
c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_test_run_new.pch" /Fo".\Release/" /Fd".\Release/" /c /GX
# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_test_run_new.pch" /Fo".\Release/" /Fd".\Release/" /
FD /
c /GX
# ADD BASE MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /win32
# ADD BASE MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /win32
# ADD MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /win32
# ADD MTL /nologo /tlb".\Release\mysql_test_run_new.tlb" /win32
# ADD BASE RSC /l 1033
# ADD BASE RSC /l 1033
...
...
VC++Files/sql/mysqld.dsp
View file @
9795796e
...
@@ -49,7 +49,7 @@ RSC=rc.exe
...
@@ -49,7 +49,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../zlib" /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "
HAVE_ARCHIVE_DB" /D "
MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
# SUBTRACT CPP /YX
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
...
@@ -75,7 +75,7 @@ LINK32=xilink6.exe
...
@@ -75,7 +75,7 @@ LINK32=xilink6.exe
# PROP Ignore_Export_Lib 0
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_
BERKELEY_DB" /D "HAVE_BLACKHO
LE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_
ARCHIVE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_EXAMP
LE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c
# SUBTRACT CPP /Fr /YX
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD BASE RSC /l 0x410 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
...
@@ -102,7 +102,7 @@ LINK32=xilink6.exe
...
@@ -102,7 +102,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c
# ADD BASE CPP /nologo /G5 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D "DBUG_OFF" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "HAVE_INNOBASE_DB" /D "
HAVE_ARCHIVE_DB" /D "
_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt /FD /c
# SUBTRACT CPP /YX
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD BASE RSC /l 0x410 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
...
@@ -130,7 +130,7 @@ LINK32=xilink6.exe
...
@@ -130,7 +130,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_
BERKELEY_DB" /D "HAVE_BLACKHO
LE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_
ARCHIVE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_EXAMP
LE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c
# SUBTRACT CPP /YX
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
...
@@ -159,7 +159,7 @@ LINK32=xilink6.exe
...
@@ -159,7 +159,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_
BERKELEY_DB" /D "HAVE_BLACKHO
LE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_
ARCHIVE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_EXAMP
LE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c
# SUBTRACT CPP /YX
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
...
@@ -215,7 +215,7 @@ LINK32=xilink6.exe
...
@@ -215,7 +215,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "MYSQL_SERVER" /D LICENSE=Commercial /D "_MBCS" /D "HAVE_DLOPEN" /D "HAVE_INNOBASE_DB" /D "
HAVE_ARCHIVE_DB" /D "
DBUG_OFF" /D "NDEBUG" /D "_WINDOWS" /D "_CONSOLE" /D MYSQL_SERVER_SUFFIX=-pro /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
BSC32=bscmake.exe
...
@@ -272,7 +272,7 @@ LINK32=xilink6.exe
...
@@ -272,7 +272,7 @@ LINK32=xilink6.exe
# PROP Target_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c
# SUBTRACT BASE CPP /YX
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENSE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt /FD
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D
"HAVE_ARCHIVE_DB" /D
LICENSE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt /FD
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
BSC32=bscmake.exe
...
@@ -451,6 +451,14 @@ SOURCE=.\gstream.cpp
...
@@ -451,6 +451,14 @@ SOURCE=.\gstream.cpp
# End Source File
# End Source File
# Begin Source File
# Begin Source File
SOURCE=.\examples\ha_archive.cpp
# End Source File
# Begin Source File
SOURCE=.\examples\ha_example.cpp
# End Source File
# Begin Source File
SOURCE=.\ha_blackhole.cpp
SOURCE=.\ha_blackhole.cpp
# End Source File
# End Source File
# Begin Source File
# Begin Source File
...
...
mysql-test/include/have_lowercase0.inc
0 → 100644
View file @
9795796e
--
require
r
/
lowercase0
.
require
--
disable_query_log
;
show
variables
like
"lower_case_%"
;
--
enable_query_log
;
mysql-test/include/ps_conv.inc
View file @
9795796e
...
@@ -576,15 +576,19 @@ set @arg00= 9223372036854775807 ;
...
@@ -576,15 +576,19 @@ set @arg00= 9223372036854775807 ;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
set
@
arg00
=
'9223372036854775807'
;
set
@
arg00
=
'9223372036854775807'
;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
# Use the minimum BIGINT from the manual
# Use the minimum BIGINT from the manual
#
#
...
@@ -592,15 +596,19 @@ set @arg00= -9223372036854775808 ;
...
@@ -592,15 +596,19 @@ set @arg00= -9223372036854775808 ;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
set
@
arg00
=
'-9223372036854775808'
;
set
@
arg00
=
'-9223372036854775808'
;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
# Numeric overflow of columns(c1, c2, c3, c4, c5, c12) with type not in
# Numeric overflow of columns(c1, c2, c3, c4, c5, c12) with type not in
...
@@ -610,8 +618,10 @@ set @arg00= 1.11111111111111111111e+50 ;
...
@@ -610,8 +618,10 @@ set @arg00= 1.11111111111111111111e+50 ;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
# Attention: The columns(c1,c2,c3,c4,c5,c6) do not get the overflow,
# Attention: The columns(c1,c2,c3,c4,c5,c6) do not get the overflow,
# because the string is treated as written integer and
# because the string is treated as written integer and
...
@@ -620,15 +630,19 @@ set @arg00= '1.11111111111111111111e+50' ;
...
@@ -620,15 +630,19 @@ set @arg00= '1.11111111111111111111e+50' ;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
set
@
arg00
=
-
1.11111111111111111111e+50
;
set
@
arg00
=
-
1.11111111111111111111e+50
;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
# Attention: The columns(c1,c2,c3,c4,c5,c6) do not get the overflow,
# Attention: The columns(c1,c2,c3,c4,c5,c6) do not get the overflow,
# because the string is treated as written integer and
# because the string is treated as written integer and
...
@@ -637,8 +651,10 @@ set @arg00= '-1.11111111111111111111e+50' ;
...
@@ -637,8 +651,10 @@ set @arg00= '-1.11111111111111111111e+50' ;
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
execute
my_insert
using
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
,
@
arg00
;
--
vertical_results
--
vertical_results
--
replace_result
e
+
0
e
+
execute
my_select
;
execute
my_select
;
--
horizontal_results
--
horizontal_results
--
replace_result
e
+
0
e
+
execute
my_delete
;
execute
my_delete
;
########################## test of string types ##########################
########################## test of string types ##########################
...
...
mysql-test/lib/mtr_process.pl
View file @
9795796e
...
@@ -185,10 +185,6 @@ sub spawn_parent_impl {
...
@@ -185,10 +185,6 @@ sub spawn_parent_impl {
if
(
$mode
eq
'
run
'
or
$mode
eq
'
test
'
)
if
(
$mode
eq
'
run
'
or
$mode
eq
'
test
'
)
{
{
my
$exit_value
=
-
1
;
# my $signal_num= 0;
# my $dumped_core= 0;
if
(
$mode
eq
'
run
'
)
if
(
$mode
eq
'
run
'
)
{
{
# Simple run of command, we wait for it to return
# Simple run of command, we wait for it to return
...
@@ -199,12 +195,7 @@ sub spawn_parent_impl {
...
@@ -199,12 +195,7 @@ sub spawn_parent_impl {
mtr_error
("
$path
(
$pid
) got lost somehow
");
mtr_error
("
$path
(
$pid
) got lost somehow
");
}
}
$exit_value
=
$?
;
return
mtr_process_exit_status
(
$?
);
# $exit_value= $? >> 8;
# $signal_num= $? & 127;
# $dumped_core= $? & 128;
return
$exit_value
;
}
}
else
else
{
{
...
@@ -218,6 +209,8 @@ sub spawn_parent_impl {
...
@@ -218,6 +209,8 @@ sub spawn_parent_impl {
# FIXME is this as it should be? Can't mysqld terminate
# FIXME is this as it should be? Can't mysqld terminate
# normally from running a test case?
# normally from running a test case?
my
$exit_value
=
-
1
;
my
$saved_exit_value
;
my
$ret_pid
;
# What waitpid() returns
my
$ret_pid
;
# What waitpid() returns
while
(
(
$ret_pid
=
waitpid
(
-
1
,
0
))
!=
-
1
)
while
(
(
$ret_pid
=
waitpid
(
-
1
,
0
))
!=
-
1
)
...
@@ -227,13 +220,28 @@ sub spawn_parent_impl {
...
@@ -227,13 +220,28 @@ sub spawn_parent_impl {
# but not $exit_value, this is flagged from
# but not $exit_value, this is flagged from
#
#
my
$timer_name
=
mtr_timer_timeout
(
$::glob_timers
,
$ret_pid
);
if
(
$timer_name
)
{
if
(
$timer_name
eq
"
suite
"
)
{
# We give up here
# FIXME we should only give up the suite, not all of the run?
print
STDERR
"
\n
";
mtr_error
("
Test suite timeout
");
}
elsif
(
$timer_name
eq
"
testcase
"
)
{
$saved_exit_value
=
63
;
# Mark as timeout
kill
(
9
,
$pid
);
# Kill mysqltest
next
;
# Go on and catch the termination
}
}
if
(
$ret_pid
==
$pid
)
if
(
$ret_pid
==
$pid
)
{
{
# We got termination of mysqltest, we are done
# We got termination of mysqltest, we are done
$exit_value
=
$?
;
$exit_value
=
mtr_process_exit_status
(
$?
);
# $exit_value= $? >> 8;
# $signal_num= $? & 127;
# $dumped_core= $? & 128;
last
;
last
;
}
}
...
@@ -281,7 +289,7 @@ sub spawn_parent_impl {
...
@@ -281,7 +289,7 @@ sub spawn_parent_impl {
}
}
}
}
return
$exit_value
;
return
$
saved_exit_value
||
$
exit_value
;
}
}
}
}
else
else
...
@@ -292,6 +300,23 @@ sub spawn_parent_impl {
...
@@ -292,6 +300,23 @@ sub spawn_parent_impl {
}
}
# ----------------------------------------------------------------------
# We try to emulate how an Unix shell calculates the exit code
# ----------------------------------------------------------------------
sub
mtr_process_exit_status
{
my
$raw_status
=
shift
;
if
(
$raw_status
&
127
)
{
return
(
$raw_status
&
127
)
+
128
;
# Signal num + 128
}
else
{
return
$raw_status
>>
8
;
# Exit code
}
}
##############################################################################
##############################################################################
#
#
...
@@ -331,7 +356,7 @@ sub mtr_kill_leftovers () {
...
@@ -331,7 +356,7 @@ sub mtr_kill_leftovers () {
});
});
}
}
mtr_mysqladmin_shutdown
(
\
@args
);
mtr_mysqladmin_shutdown
(
\
@args
,
20
);
# We now have tried to terminate nice. We have waited for the listen
# We now have tried to terminate nice. We have waited for the listen
# port to be free, but can't really tell if the mysqld process died
# port to be free, but can't really tell if the mysqld process died
...
@@ -441,7 +466,8 @@ sub mtr_stop_mysqld_servers ($) {
...
@@ -441,7 +466,8 @@ sub mtr_stop_mysqld_servers ($) {
# First try nice normal shutdown using 'mysqladmin'
# First try nice normal shutdown using 'mysqladmin'
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
mtr_mysqladmin_shutdown
(
$spec
);
# Shutdown time must be high as slave may be in reconnect
mtr_mysqladmin_shutdown
(
$spec
,
70
);
# ----------------------------------------------------------------------
# ----------------------------------------------------------------------
# We loop with waitpid() nonblocking to see how many of the ones we
# We loop with waitpid() nonblocking to see how many of the ones we
...
@@ -591,8 +617,9 @@ sub mtr_stop_mysqld_servers ($) {
...
@@ -591,8 +617,9 @@ sub mtr_stop_mysqld_servers ($) {
#
#
##############################################################################
##############################################################################
sub
mtr_mysqladmin_shutdown
()
{
sub
mtr_mysqladmin_shutdown
{
my
$spec
=
shift
;
my
$spec
=
shift
;
my
$adm_shutdown_tmo
=
shift
;
my
%
mysql_admin_pids
;
my
%
mysql_admin_pids
;
my
@to_kill_specs
;
my
@to_kill_specs
;
...
@@ -631,7 +658,7 @@ sub mtr_mysqladmin_shutdown () {
...
@@ -631,7 +658,7 @@ sub mtr_mysqladmin_shutdown () {
mtr_add_arg
(
$args
,
"
--protocol=tcp
");
# Needed if no --socket
mtr_add_arg
(
$args
,
"
--protocol=tcp
");
# Needed if no --socket
}
}
mtr_add_arg
(
$args
,
"
--connect_timeout=5
");
mtr_add_arg
(
$args
,
"
--connect_timeout=5
");
mtr_add_arg
(
$args
,
"
--shutdown_timeout=
20
");
mtr_add_arg
(
$args
,
"
--shutdown_timeout=
$adm_shutdown_tmo
");
mtr_add_arg
(
$args
,
"
shutdown
");
mtr_add_arg
(
$args
,
"
shutdown
");
# We don't wait for termination of mysqladmin
# We don't wait for termination of mysqladmin
my
$pid
=
mtr_spawn
(
$::exe_mysqladmin
,
$args
,
my
$pid
=
mtr_spawn
(
$::exe_mysqladmin
,
$args
,
...
@@ -808,11 +835,15 @@ sub sleep_until_file_created ($$$) {
...
@@ -808,11 +835,15 @@ sub sleep_until_file_created ($$$) {
# FIXME something is wrong, we sometimes terminate with "Hangup" written
# FIXME something is wrong, we sometimes terminate with "Hangup" written
# to tty, and no STDERR output telling us why.
# to tty, and no STDERR output telling us why.
# FIXME for some readon, setting HUP to 'IGNORE' will cause exit() to
# write out "Hangup", and maybe loose some output. We insert a sleep...
sub
mtr_exit
($)
{
sub
mtr_exit
($)
{
my
$code
=
shift
;
my
$code
=
shift
;
# cluck("Called mtr_exit()");
# cluck("Called mtr_exit()");
local
$SIG
{
HUP
}
=
'
IGNORE
';
local
$SIG
{
HUP
}
=
'
IGNORE
';
kill
('
HUP
',
-
$$
);
kill
('
HUP
',
-
$$
);
sleep
2
;
exit
(
$code
);
exit
(
$code
);
}
}
...
...
mysql-test/lib/mtr_report.pl
View file @
9795796e
...
@@ -109,7 +109,14 @@ sub mtr_report_test_failed ($) {
...
@@ -109,7 +109,14 @@ sub mtr_report_test_failed ($) {
my
$tinfo
=
shift
;
my
$tinfo
=
shift
;
$tinfo
->
{'
result
'}
=
'
MTR_RES_FAILED
';
$tinfo
->
{'
result
'}
=
'
MTR_RES_FAILED
';
print
"
[ fail ]
\n
";
if
(
$tinfo
->
{'
timeout
'}
)
{
print
"
[ fail ] timeout
\n
";
}
else
{
print
"
[ fail ]
\n
";
}
# FIXME Instead of this test, and meaningless error message in 'else'
# FIXME Instead of this test, and meaningless error message in 'else'
# we should write out into $::path_timefile when the error occurs.
# we should write out into $::path_timefile when the error occurs.
...
...
mysql-test/lib/mtr_timer.pl
0 → 100644
View file @
9795796e
# -*- cperl -*-
# This is a library file used by the Perl version of mysql-test-run,
# and is part of the translation of the Bourne shell script with the
# same name.
use
Carp
qw(cluck)
;
use
Socket
;
use
Errno
;
use
strict
;
#use POSIX ":sys_wait_h";
use
POSIX
'
WNOHANG
';
sub
mtr_init_timers
();
sub
mtr_timer_start
($$$);
sub
mtr_timer_stop
($$);
sub
mtr_timer_waitpid
($$$);
##############################################################################
#
# Initiate a structure shared by all timers
#
##############################################################################
sub
mtr_init_timers
()
{
my
$timers
=
{
timers
=>
{},
pids
=>
{}};
return
$timers
;
}
##############################################################################
#
# Start, stop and poll a timer
#
# As alarm() isn't portable to Windows, we use separate processes to
# implement timers. That is why there is a mtr_timer_waitpid(), as this
# is where we catch a timeout.
#
##############################################################################
sub
mtr_timer_start
($$$)
{
my
(
$timers
,
$name
,
$duration
)
=
@_
;
if
(
exists
$timers
->
{'
timers
'}
->
{
$name
}
)
{
# We have an old running timer, kill it
mtr_timer_stop
(
$timers
,
$name
);
}
FORK:
{
my
$tpid
=
fork
();
if
(
!
defined
$tpid
)
{
if
(
$!
==
$!
{
EAGAIN
}
)
# See "perldoc Errno"
{
mtr_debug
("
Got EAGAIN from fork(), sleep 1 second and redo
");
sleep
(
1
);
redo
FORK
;
}
else
{
mtr_error
("
can't fork
");
}
}
if
(
$tpid
)
{
# Parent, record the information
$timers
->
{'
timers
'}
->
{
$name
}
->
{'
pid
'}
=
$tpid
;
$timers
->
{'
timers
'}
->
{
$name
}
->
{'
duration
'}
=
$duration
;
$timers
->
{'
pids
'}
->
{
$tpid
}
=
$name
;
}
else
{
# Child, redirect output and exec
# FIXME do we need to redirect streams?
$0
=
"
mtr_timer(timers,
$name
,
$duration
)
";
sleep
(
$duration
);
exit
(
0
);
}
}
}
sub
mtr_timer_stop
($$)
{
my
(
$timers
,
$name
)
=
@_
;
if
(
exists
$timers
->
{'
timers
'}
->
{
$name
}
)
{
my
$tpid
=
$timers
->
{'
timers
'}
->
{
$name
}
->
{'
pid
'};
# FIXME as Cygwin reuses pids fast, maybe check that is
# the expected process somehow?!
kill
(
9
,
$tpid
);
# As the timers are so simple programs, we trust them to terminate,
# and use blocking wait for it. We wait just to avoid a zombie.
waitpid
(
$tpid
,
0
);
delete
$timers
->
{'
timers
'}
->
{
$name
};
# Remove the timer information
delete
$timers
->
{'
pids
'}
->
{
$tpid
};
# and PID reference
return
1
;
}
else
{
mtr_debug
("
Asked to stop timer
\"
$name
\"
not started
");
return
0
;
}
}
sub
mtr_timer_timeout
($$)
{
my
(
$timers
,
$pid
)
=
@_
;
return
""
unless
exists
$timers
->
{'
pids
'}
->
{
$pid
};
# We got a timeout
my
$name
=
$timers
->
{'
pids
'}
->
{
$pid
};
mtr_timer_stop
(
$timers
,
$timers
->
{'
timers
'}
->
{
$name
});
return
$name
;
}
1
;
mysql-test/mysql-test-run.pl
View file @
9795796e
...
@@ -90,6 +90,7 @@ use strict;
...
@@ -90,6 +90,7 @@ use strict;
require
"
lib/mtr_cases.pl
";
require
"
lib/mtr_cases.pl
";
require
"
lib/mtr_process.pl
";
require
"
lib/mtr_process.pl
";
require
"
lib/mtr_timer.pl
";
require
"
lib/mtr_io.pl
";
require
"
lib/mtr_io.pl
";
require
"
lib/mtr_gcov.pl
";
require
"
lib/mtr_gcov.pl
";
require
"
lib/mtr_gprof.pl
";
require
"
lib/mtr_gprof.pl
";
...
@@ -137,6 +138,7 @@ our $glob_mysql_test_dir= undef;
...
@@ -137,6 +138,7 @@ our $glob_mysql_test_dir= undef;
our
$glob_mysql_bench_dir
=
undef
;
our
$glob_mysql_bench_dir
=
undef
;
our
$glob_hostname
=
undef
;
our
$glob_hostname
=
undef
;
our
$glob_scriptname
=
undef
;
our
$glob_scriptname
=
undef
;
our
$glob_timers
=
undef
;
our
$glob_use_running_server
=
0
;
our
$glob_use_running_server
=
0
;
our
$glob_use_running_ndbcluster
=
0
;
our
$glob_use_running_ndbcluster
=
0
;
our
$glob_use_embedded_server
=
0
;
our
$glob_use_embedded_server
=
0
;
...
@@ -232,8 +234,10 @@ our $opt_skip_test;
...
@@ -232,8 +234,10 @@ our $opt_skip_test;
our
$opt_sleep
;
our
$opt_sleep
;
our
$opt_ps_protocol
;
our
$opt_ps_protocol
;
our
$opt_sleep_time_after_restart
=
1
;
our
$opt_sleep_time_after_restart
=
1
;
our
$opt_sleep_time_for_delete
=
10
;
our
$opt_sleep_time_for_delete
=
10
;
our
$opt_testcase_timeout
=
5
;
# 5 min max
our
$opt_suite_timeout
=
120
;
# 2 hours max
our
$opt_socket
;
our
$opt_socket
;
...
@@ -435,6 +439,8 @@ sub initial_setup () {
...
@@ -435,6 +439,8 @@ sub initial_setup () {
$path_my_basedir
=
$path_my_basedir
=
$opt_source_dist
?
$glob_mysql_test_dir
:
$glob_basedir
;
$opt_source_dist
?
$glob_mysql_test_dir
:
$glob_basedir
;
$glob_timers
=
mtr_init_timers
();
}
}
...
@@ -530,6 +536,8 @@ sub command_line_setup () {
...
@@ -530,6 +536,8 @@ sub command_line_setup () {
'
vardir=s
'
=>
\
$opt_vardir
,
'
vardir=s
'
=>
\
$opt_vardir
,
'
verbose
'
=>
\
$opt_verbose
,
'
verbose
'
=>
\
$opt_verbose
,
'
wait-timeout=i
'
=>
\
$opt_wait_timeout
,
'
wait-timeout=i
'
=>
\
$opt_wait_timeout
,
'
testcase-timeout=i
'
=>
\
$opt_testcase_timeout
,
'
suite-timeout=i
'
=>
\
$opt_suite_timeout
,
'
warnings|log-warnings
'
=>
\
$opt_warnings
,
'
warnings|log-warnings
'
=>
\
$opt_warnings
,
'
with-openssl
'
=>
\
$opt_with_openssl
,
'
with-openssl
'
=>
\
$opt_with_openssl
,
...
@@ -1197,6 +1205,8 @@ sub run_suite () {
...
@@ -1197,6 +1205,8 @@ sub run_suite () {
mtr_report
("
Finding Tests in the '
$suite
' suite
");
mtr_report
("
Finding Tests in the '
$suite
' suite
");
mtr_timer_start
(
$glob_timers
,"
suite
",
60
*
$opt_suite_timeout
);
my
$tests
=
collect_test_cases
(
$suite
);
my
$tests
=
collect_test_cases
(
$suite
);
mtr_report
("
Starting Tests in the '
$suite
' suite
");
mtr_report
("
Starting Tests in the '
$suite
' suite
");
...
@@ -1205,7 +1215,9 @@ sub run_suite () {
...
@@ -1205,7 +1215,9 @@ sub run_suite () {
foreach
my
$tinfo
(
@$tests
)
foreach
my
$tinfo
(
@$tests
)
{
{
mtr_timer_start
(
$glob_timers
,"
testcase
",
60
*
$opt_testcase_timeout
);
run_testcase
(
$tinfo
);
run_testcase
(
$tinfo
);
mtr_timer_stop
(
$glob_timers
,"
testcase
");
}
}
mtr_print_line
();
mtr_print_line
();
...
@@ -1226,6 +1238,8 @@ sub run_suite () {
...
@@ -1226,6 +1238,8 @@ sub run_suite () {
}
}
mtr_report_stats
(
$tests
);
mtr_report_stats
(
$tests
);
mtr_timer_stop
(
$glob_timers
,"
suite
");
}
}
...
@@ -1523,6 +1537,11 @@ sub run_testcase ($) {
...
@@ -1523,6 +1537,11 @@ sub run_testcase ($) {
# Testcase itself tell us to skip this one
# Testcase itself tell us to skip this one
mtr_report_test_skipped
(
$tinfo
);
mtr_report_test_skipped
(
$tinfo
);
}
}
elsif
(
$res
==
63
)
{
$tinfo
->
{'
timeout
'}
=
1
;
# Mark as timeout
report_failure_and_restart
(
$tinfo
);
}
else
else
{
{
# Test case failed, if in control mysqltest returns 1
# Test case failed, if in control mysqltest returns 1
...
@@ -1657,8 +1676,6 @@ sub mysqld_arguments ($$$$$) {
...
@@ -1657,8 +1676,6 @@ sub mysqld_arguments ($$$$$) {
my
$extra_opt
=
shift
;
my
$extra_opt
=
shift
;
my
$slave_master_info
=
shift
;
my
$slave_master_info
=
shift
;
# print STDERR Dumper($extra_opt);
my
$sidx
=
"";
# Index as string, 0 is empty string
my
$sidx
=
"";
# Index as string, 0 is empty string
if
(
$idx
>
0
)
if
(
$idx
>
0
)
{
{
...
@@ -2026,6 +2043,7 @@ sub run_mysqltest ($) {
...
@@ -2026,6 +2043,7 @@ sub run_mysqltest ($) {
my
$tinfo
=
shift
;
my
$tinfo
=
shift
;
my
$cmdline_mysqldump
=
"
$exe_mysqldump
--no-defaults -uroot
"
.
my
$cmdline_mysqldump
=
"
$exe_mysqldump
--no-defaults -uroot
"
.
"
--port=
$master
->[0]->{'path_myport'}
"
.
"
--socket=
$master
->[0]->{'path_mysock'} --password=
";
"
--socket=
$master
->[0]->{'path_mysock'} --password=
";
if
(
$opt_debug
)
if
(
$opt_debug
)
{
{
...
@@ -2034,6 +2052,7 @@ sub run_mysqltest ($) {
...
@@ -2034,6 +2052,7 @@ sub run_mysqltest ($) {
}
}
my
$cmdline_mysqlshow
=
"
$exe_mysqlshow
-uroot
"
.
my
$cmdline_mysqlshow
=
"
$exe_mysqlshow
-uroot
"
.
"
--port=
$master
->[0]->{'path_myport'}
"
.
"
--socket=
$master
->[0]->{'path_mysock'} --password=
";
"
--socket=
$master
->[0]->{'path_mysock'} --password=
";
if
(
$opt_debug
)
if
(
$opt_debug
)
{
{
...
@@ -2262,6 +2281,10 @@ Misc options
...
@@ -2262,6 +2281,10 @@ Misc options
help Get this help text
help Get this help text
unified-diff | udiff When presenting differences, use unified diff
unified-diff | udiff When presenting differences, use unified diff
testcase-timeout=MINUTES Max test case run time (default 5)
suite-timeout=MINUTES Max test suite run time (default 120)
Options not yet described, or that I want to look into more
Options not yet described, or that I want to look into more
big-test
big-test
...
@@ -2281,4 +2304,5 @@ Options not yet described, or that I want to look into more
...
@@ -2281,4 +2304,5 @@ Options not yet described, or that I want to look into more
HERE
HERE
mtr_exit
(
1
);
mtr_exit
(
1
);
}
}
mysys/charset.c
View file @
9795796e
...
@@ -663,3 +663,22 @@ CHARSET_INFO *fs_character_set()
...
@@ -663,3 +663,22 @@ CHARSET_INFO *fs_character_set()
return
fs_cset_cache
;
return
fs_cset_cache
;
}
}
#endif
#endif
/*
Transforms a string into hex form.
*/
char
*
bare_str_to_hex
(
char
*
to
,
const
char
*
from
,
uint
len
)
{
char
*
p
=
to
;
uint
i
;
for
(
i
=
0
;
i
<
len
;
i
++
,
p
+=
2
)
{
/* val[i] is char. Casting to uchar helps greatly if val[i] < 0 */
uint
tmp
=
(
uint
)
(
uchar
)
from
[
i
];
p
[
0
]
=
_dig_vec_upper
[
tmp
>>
4
];
p
[
1
]
=
_dig_vec_upper
[
tmp
&
15
];
}
*
p
=
0
;
return
p
;
/* pointer to end 0 of 'to' */
}
sql/examples/ha_archive.cc
View file @
9795796e
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
#pragma implementation // gcc: Class implementation
#pragma implementation // gcc: Class implementation
#endif
#endif
#include
<mysql_priv.h>
#include
"../mysql_priv.h"
#ifdef HAVE_ARCHIVE_DB
#ifdef HAVE_ARCHIVE_DB
#include "ha_archive.h"
#include "ha_archive.h"
...
...
sql/examples/ha_archive.h
View file @
9795796e
...
@@ -58,7 +58,7 @@ class ha_archive: public handler
...
@@ -58,7 +58,7 @@ class ha_archive: public handler
ha_archive
(
TABLE
*
table
)
:
handler
(
table
)
ha_archive
(
TABLE
*
table
)
:
handler
(
table
)
{
{
/* Set our original buffer from pre-allocated memory */
/* Set our original buffer from pre-allocated memory */
buffer
.
set
(
byte_buffer
,
IO_SIZE
,
system_charset_info
);
buffer
.
set
(
(
char
*
)
byte_buffer
,
IO_SIZE
,
system_charset_info
);
/* The size of the offset value we will use for position() */
/* The size of the offset value we will use for position() */
ref_length
=
sizeof
(
z_off_t
);
ref_length
=
sizeof
(
z_off_t
);
...
...
sql/examples/ha_example.cc
View file @
9795796e
...
@@ -67,7 +67,7 @@
...
@@ -67,7 +67,7 @@
#pragma implementation // gcc: Class implementation
#pragma implementation // gcc: Class implementation
#endif
#endif
#include
<mysql_priv.h>
#include
"../mysql_priv.h"
#ifdef HAVE_EXAMPLE_DB
#ifdef HAVE_EXAMPLE_DB
#include "ha_example.h"
#include "ha_example.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment