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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
cc8a3339
Commit
cc8a3339
authored
Jan 06, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
parents
f453677d
746fd9fd
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
219 additions
and
118 deletions
+219
-118
.bzrignore
.bzrignore
+93
-41
VC++Files/client/mysqldump.dsp
VC++Files/client/mysqldump.dsp
+6
-6
VC++Files/client/mysqltest.dsp
VC++Files/client/mysqltest.dsp
+8
-8
VC++Files/mysql-test/mysql_test_run_new.dsp
VC++Files/mysql-test/mysql_test_run_new.dsp
+2
-2
innobase/os/os0file.c
innobase/os/os0file.c
+15
-1
mysql-test/my_manage.c
mysql-test/my_manage.c
+9
-1
mysql-test/mysql_test_run_new.c
mysql-test/mysql_test_run_new.c
+77
-53
mysys/mf_keycaches.c
mysys/mf_keycaches.c
+1
-1
mysys/my_sleep.c
mysys/my_sleep.c
+2
-0
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+2
-2
sql-bench/crash-me.sh
sql-bench/crash-me.sh
+1
-1
sql-common/client.c
sql-common/client.c
+3
-2
No files found.
.bzrignore
View file @
cc8a3339
...
...
@@ -45,6 +45,19 @@ COPYING
COPYING.LIB
Docs/#manual.texi#
Docs/INSTALL-BINARY
Docs/Images/myaccess-odbc.txt
Docs/Images/myaccess.txt
Docs/Images/myarchitecture.txt
Docs/Images/mydll-properties.txt
Docs/Images/mydsn-example.txt
Docs/Images/mydsn-icon.txt
Docs/Images/mydsn-options.txt
Docs/Images/mydsn-setup.txt
Docs/Images/mydsn-test-fail.txt
Docs/Images/mydsn-test-success.txt
Docs/Images/mydsn-trace.txt
Docs/Images/mydsn.txt
Docs/Images/myflowchart.txt
Docs/include.texi
Docs/internals.html
Docs/internals.info
...
...
@@ -88,7 +101,9 @@ Makefile.in
Makefile.in'
PENDING/*
TAGS
ac_available_languages_fragment
aclocal.m4
analyse.test
autom4te-2.53.cache/output.0
autom4te-2.53.cache/requests
autom4te-2.53.cache/traces.0
...
...
@@ -241,6 +256,7 @@ client/mf_iocache.c
client/mf_iocache.cc
client/mysql
client/mysqladmin
client/mysqladmin.c
client/mysqlbinlog
client/mysqlcheck
client/mysqldump
...
...
@@ -287,6 +303,7 @@ gmon.out
hardcopy.0
heap/hp_test1
heap/hp_test2
help
help.c
help.h
include/my_config.h
...
...
@@ -355,7 +372,9 @@ libmysqld/field_conv.cc
libmysqld/filesort.cc
libmysqld/get_password.c
libmysqld/gstream.cc
libmysqld/ha_archive.cc
libmysqld/ha_berkeley.cc
libmysqld/ha_example.cc
libmysqld/ha_heap.cc
libmysqld/ha_innobase.cc
libmysqld/ha_innodb.cc
...
...
@@ -363,6 +382,7 @@ libmysqld/ha_isam.cc
libmysqld/ha_isammrg.cc
libmysqld/ha_myisam.cc
libmysqld/ha_myisammrg.cc
libmysqld/ha_tina.cc
libmysqld/handler.cc
libmysqld/hash_filo.cc
libmysqld/hostname.cc
...
...
@@ -492,15 +512,71 @@ myisam/test2.MYD
myisam/test2.MYI
mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
mysql-4.0.2-alpha.tar.gz
mysql-4.1.8-win-src.zip
mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/mysql-test-run
mysql-test/mysql-test-run.log
mysql-test/mysql_test_run_new
mysql-test/ndb/ndbcluster
mysql-test/r/*.reject
mysql-test/r/alter_table.err
mysql-test/r/archive.err
mysql-test/r/bdb-alter-table-1.err
mysql-test/r/bdb-alter-table-2.err
mysql-test/r/bdb-crash.err
mysql-test/r/bdb-deadlock.err
mysql-test/r/bdb.err
mysql-test/r/bdb_cache.err
mysql-test/r/client_test.err
mysql-test/r/csv.err
mysql-test/r/ctype_ucs.err
mysql-test/r/derived.err
mysql-test/r/exampledb.err
mysql-test/r/func_encrypt.err
mysql-test/r/isam.err
mysql-test/r/lowercase_table2.err
mysql-test/r/multi_update.err
mysql-test/r/mysql_protocols.err
mysql-test/r/mysqlbinlog.err
mysql-test/r/mysqlbinlog2.err
mysql-test/r/mysqldump.err
mysql-test/r/mysqltest.err
mysql-test/r/ndb_alter_table.err
mysql-test/r/ndb_autodiscover.err
mysql-test/r/ndb_autodiscover2.err
mysql-test/r/ndb_basic.err
mysql-test/r/ndb_blob.err
mysql-test/r/ndb_cache.err
mysql-test/r/ndb_charset.err
mysql-test/r/ndb_index.err
mysql-test/r/ndb_index_ordered.err
mysql-test/r/ndb_index_unique.err
mysql-test/r/ndb_insert.err
mysql-test/r/ndb_limit.err
mysql-test/r/ndb_lock.err
mysql-test/r/ndb_minmax.err
mysql-test/r/ndb_replace.err
mysql-test/r/ndb_subquery.err
mysql-test/r/ndb_transaction.err
mysql-test/r/ndb_truncate.err
mysql-test/r/ndb_types.err
mysql-test/r/ndb_update.err
mysql-test/r/openssl_1.err
mysql-test/r/ps_1general.err
mysql-test/r/ps_6bdb.err
mysql-test/r/ps_7ndb.err
mysql-test/r/query_cache.err
mysql-test/r/query_cache_merge.err
mysql-test/r/raid.err
mysql-test/r/repair.err
mysql-test/r/replace.err
mysql-test/r/rpl000001.err
mysql-test/r/rpl000001.eval
mysql-test/r/rpl000002.eval
mysql-test/r/rpl000014.eval
mysql-test/r/rpl000015.err
mysql-test/r/rpl000015.eval
mysql-test/r/rpl000016.eval
mysql-test/r/rpl_log.eval
...
...
@@ -641,6 +717,8 @@ ndb/examples/ndbapi_example2/ndbapi_example2
ndb/examples/ndbapi_example3/ndbapi_example3
ndb/examples/ndbapi_example5/ndbapi_example5
ndb/examples/select_all/select_all
ndb/include/ndb_global.h
ndb/include/ndb_version.h
ndb/lib/libMGM_API.so
ndb/lib/libNDB_API.so
ndb/lib/libNDB_ODBC.so
...
...
@@ -711,10 +789,25 @@ ndb/tools/ndb_delete_all
ndb/tools/ndb_desc
ndb/tools/ndb_drop_index
ndb/tools/ndb_drop_table
ndb/tools/ndb_restore
ndb/tools/ndb_select_all
ndb/tools/ndb_select_count
ndb/tools/ndb_show_tables
ndb/tools/ndb_test_platform
ndb/tools/ndb_waiter
ndbcluster-1186
ndbcluster-1186/SCCS
ndbcluster-1186/config.ini
ndbcluster-1186/ndb_1.pid
ndbcluster-1186/ndb_1_out.log
ndbcluster-1186/ndb_1_signal.log
ndbcluster-1186/ndb_2.pid
ndbcluster-1186/ndb_2_out.log
ndbcluster-1186/ndb_2_signal.log
ndbcluster-1186/ndb_3.pid
ndbcluster-1186/ndb_3_cluster.log
ndbcluster-1186/ndb_3_out.log
ndbcluster-1186/ndbcluster.pid
pull.log
regex/re
repl-tests/test-repl-ts/repl-timestamp.master.reject
...
...
@@ -909,44 +1002,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
Docs/Images/myaccess-odbc.txt
Docs/Images/myaccess.txt
Docs/Images/myarchitecture.txt
Docs/Images/mydll-properties.txt
Docs/Images/mydsn-example.txt
Docs/Images/mydsn-icon.txt
Docs/Images/mydsn-options.txt
Docs/Images/mydsn-setup.txt
Docs/Images/mydsn-test-fail.txt
Docs/Images/mydsn-test-success.txt
Docs/Images/mydsn-trace.txt
Docs/Images/mydsn.txt
Docs/Images/myflowchart.txt
mysql-test/mysql_test_run_new
ndb/tools/ndb_test_platform
help
ndbcluster-1186
ndbcluster-1186/SCCS
ndbcluster-1186/config.ini
ndbcluster-1186/ndb_1.pid
ndbcluster-1186/ndb_1_out.log
ndbcluster-1186/ndb_1_signal.log
ndbcluster-1186/ndb_2.pid
ndbcluster-1186/ndb_2_out.log
ndbcluster-1186/ndb_2_signal.log
ndbcluster-1186/ndb_3.pid
ndbcluster-1186/ndb_3_cluster.log
ndbcluster-1186/ndb_3_out.log
ndbcluster-1186/ndbcluster.pid
ndb/tools/ndb_restore
ac_available_languages_fragment
libmysqld/ha_archive.cc
libmysqld/ha_example.cc
libmysqld/ha_tina.cc
analyse.test
client/mysqladmin.c
mysql-4.1.8-win-src.zip
ndb/include/ndb_version.h
ndb/include/ndb_global.h
ndb/include/ndb_global.h
ndb/include/ndb_version.h
VC++Files/client/mysqldump.dsp
View file @
cc8a3339
...
...
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
mysys.lib
/nologo /subsystem:console /machine:I386
# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
mysys.lib
/nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
!ELSEIF "$(CFG)" == "mysqldump - Win32 Debug"
...
...
@@ -76,8 +76,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqldump.exe" /pdbtype:sept /libpath:"..\lib_debug\\"
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
mysys.lib
/nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
mysys.lib
/nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqldump.exe" /pdbtype:sept /libpath:"..\lib_debug\\"
!ELSEIF "$(CFG)" == "mysqldump - Win32 classic"
...
...
@@ -103,8 +103,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=xilink6.exe
# ADD BASE LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"../client_classic/mysqldump.exe" /libpath:"..\lib_release\\"
# ADD BASE LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
mysys.lib
/nologo /subsystem:console /machine:I386 /out:"../client_release/mysqldump.exe" /libpath:"..\lib_release\\"
# ADD LINK32 mysqlclient.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
mysys.lib
/nologo /subsystem:console /machine:I386 /out:"../client_classic/mysqldump.exe" /libpath:"..\lib_release\\"
!ENDIF
...
...
VC++Files/client/mysqltest.dsp
View file @
cc8a3339
...
...
@@ -67,8 +67,8 @@ LINK32=link.exe
# PROP Output_Dir ".\classic"
# PROP Intermediate_Dir ".\classic"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /I "../include" /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 "../
" /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/" /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 BASE MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\classic\mysqltest.tlb" /win32
# ADD BASE RSC /l 1033 /d "NDEBUG"
...
...
@@ -77,8 +77,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib
mysys.lib regex.lib
/nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib
mysys.lib regex.lib
/nologo /out:"..\client_classic\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\classic\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ELSEIF "$(CFG)" == "mysqltest - Win32 Release"
...
...
@@ -92,8 +92,8 @@ LINK32=link.exe
# PROP Output_Dir ".\release"
# PROP Intermediate_Dir ".\release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /I "../include" /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 "../
" /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/" /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 BASE MTL /nologo /tlb".\release\mysqltest.tlb" /win32
# ADD MTL /nologo /tlb".\release\mysqltest.tlb" /win32
# ADD BASE RSC /l 1033 /d "NDEBUG"
...
...
@@ -102,8 +102,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib /nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib
mysys.lib regex.lib
/nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib
mysys.lib regex.lib
/nologo /out:"..\client_release\mysqltest.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\release\mysqltest.pdb" /pdbtype:sept /subsystem:console /MACHINE:I386
!ENDIF
...
...
VC++Files/mysql-test/mysql_test_run_new.dsp
View file @
cc8a3339
...
...
@@ -76,8 +76,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:no /pdb:".\Release\mysql_test_run_new.pdb" /pdbtype:sept /subsystem:
windows
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:no /pdb:".\Release\mysql_test_run_new.pdb" /pdbtype:sept /subsystem:
windows
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:no /pdb:".\Release\mysql_test_run_new.pdb" /pdbtype:sept /subsystem:
console
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\mysql-test\mysql_test_run_new.exe" /incremental:no /pdb:".\Release\mysql_test_run_new.pdb" /pdbtype:sept /subsystem:
console
!ENDIF
...
...
innobase/os/os0file.c
View file @
cc8a3339
...
...
@@ -1763,7 +1763,21 @@ os_file_flush(
#else
int
ret
;
#ifdef HAVE_FDATASYNC
#ifdef HAVE_DARWIN_THREADS
/* Apple has disabled fsync() for internal disk drives in OS X. That
caused corruption for a user when he tested a power outage. Let us in
OS X use a nonstandard flush method recommended by an Apple
engineer. */
ret
=
fcntl
(
file
,
F_FULLFSYNC
,
NULL
);
if
(
ret
)
{
/* If we are not on a file system that supports this, then
fall back to a plain fsync. */
ret
=
fsync
(
file
);
}
#elif HAVE_FDATASYNC
ret
=
fdatasync
(
file
);
#else
/* fprintf(stderr, "Flushing to file %p\n", file); */
...
...
mysql-test/my_manage.c
View file @
cc8a3339
...
...
@@ -327,7 +327,7 @@ int spawn(char *path, arg_list_t *al, int join, char *input,
int
spawn
(
char
*
path
,
arg_list_t
*
al
,
int
join
,
char
*
input
,
char
*
output
,
char
*
error
,
HANDLE
*
pid
)
{
intptr_t
result
;
bool
result
;
int
i
;
STARTUPINFO
startup_info
;
PROCESS_INFORMATION
process_information
;
...
...
@@ -665,7 +665,11 @@ void del_tree(char *dir)
rmdir
(
dir
);
#else
struct
_finddata_t
parent
;
#if defined(_MSC_VER) && _MSC_VER > 1200
intptr_t
handle
;
#else
long
handle
;
#endif
/* _MSC_VER && _MSC_VER > 1200 */
char
temp
[
FN_REFLEN
];
char
mask
[
FN_REFLEN
];
...
...
@@ -728,7 +732,11 @@ int removef(const char *format, ...)
va_list
ap
;
char
path
[
FN_REFLEN
];
struct
_finddata_t
parent
;
#if defined(_MSC_VER) && _MSC_VER > 1200
intptr_t
handle
;
#else
long
handle
;
#endif
/* _MSC_VER && _MSC_VER > 1200 */
char
temp
[
FN_REFLEN
];
char
*
p
;
...
...
mysql-test/mysql_test_run_new.c
View file @
cc8a3339
...
...
@@ -37,7 +37,8 @@
#include <sys/mode.h>
#endif
#ifdef __WIN__
#include <Shlwapi.h>
#include <windows.h>
#include <shlwapi.h>
#include <direct.h>
#endif
...
...
@@ -89,15 +90,25 @@ static char master_socket[FN_REFLEN]= "./var/tmp/master.sock";
static
char
slave_socket
[
FN_REFLEN
]
=
"./var/tmp/slave.sock"
;
#endif
#define MAX_COUNT_TESTES 1024
#ifdef __WIN__
# define sting_compare_func _stricmp
#else
# ifdef HAVE_STRCASECMP
# define sting_compare_func strcasecmp
# else
# define sting_compare_func strcmp
# endif
#endif
/* comma delimited list of tests to skip or empty string */
#ifndef __WIN__
static
char
skip_test
[
FN_REFLEN
]
=
" lowercase_table3 , system_mysql_db_fix "
;
#else
/*
The most ignore testes contain the calls of system command
*/
#define MAX_COUNT_TESTES 1024
/*
lowercase_table3 is disabled by Gerg
system_mysql_db_fix is disabled by Gerg
sp contains a command system
...
...
@@ -1437,12 +1448,11 @@ void setup(char *file __attribute__((unused)))
/*
Compare names of testes for right order
*/
#ifdef __WIN__
int
compare
(
const
void
*
arg1
,
const
void
*
arg2
)
{
return
_stricmp
(
*
(
char
**
)
arg1
,
*
(
char
**
)
arg2
);
return
sting_compare_func
(
*
(
char
**
)
arg1
,
*
(
char
**
)
arg2
);
}
#endif
/******************************************************************************
...
...
@@ -1454,6 +1464,10 @@ int compare( const void *arg1, const void *arg2 )
int
main
(
int
argc
,
char
**
argv
)
{
int
is_ignore_list
=
0
;
char
**
names
=
0
;
char
**
testes
=
0
;
int
name_index
;
int
index
;
/* setup */
setup
(
argv
[
0
]);
...
...
@@ -1517,6 +1531,11 @@ int main(int argc, char **argv)
else
{
/* run all tests */
testes
=
malloc
(
MAX_COUNT_TESTES
*
sizeof
(
void
*
));
if
(
!
testes
)
die
(
"can not allcate memory for sorting"
);
names
=
testes
;
name_index
=
0
;
#ifndef __WIN__
struct
dirent
*
entry
;
DIR
*
parent
;
...
...
@@ -1534,74 +1553,79 @@ int main(int argc, char **argv)
/* find the test suffix */
if
((
position
=
strinstr
(
test
,
TEST_SUFFIX
))
!=
0
)
{
/* null terminate at the suffix */
*
(
test
+
position
-
1
)
=
'\0'
;
/* run test */
run_test
(
test
);
if
(
name_index
<
MAX_COUNT_TESTES
)
{
/* null terminate at the suffix */
*
(
test
+
position
-
1
)
=
'\0'
;
/* insert test */
*
names
=
malloc
(
FN_REFLEN
);
strcpy
(
*
names
,
test
);
names
++
;
name_index
++
;
}
else
die
(
"can not sort files, array is overloaded"
);
}
}
closedir
(
parent
);
}
#else
struct
_finddata_t
dir
;
intptr_t
handle
;
char
test
[
FN_LEN
];
char
mask
[
FN_REFLEN
];
char
*
p
;
int
position
;
char
**
names
=
0
;
char
**
testes
=
0
;
int
name_index
;
int
index
;
{
struct
_finddata_t
dir
;
int
*
handle
;
char
test
[
FN_LEN
];
char
mask
[
FN_REFLEN
];
char
*
p
;
int
position
;
/* single test */
single_test
=
FALSE
;
/* single test */
single_test
=
FALSE
;
snprintf
(
mask
,
FN_REFLEN
,
"%s/*.test"
,
test_dir
);
snprintf
(
mask
,
FN_REFLEN
,
"%s/*.test"
,
test_dir
);
if
((
handle
=
_findfirst
(
mask
,
&
dir
))
==
-
1L
)
{
die
(
"Unable to open tests directory."
);
}
if
((
handle
=
_findfirst
(
mask
,
&
dir
))
==
-
1L
)
{
die
(
"Unable to open tests directory."
);
}
names
=
malloc
(
MAX_COUNT_TESTES
*
4
);
testes
=
names
;
name_index
=
0
;
do
{
if
(
!
(
dir
.
attrib
&
_A_SUBDIR
))
do
{
strcpy
(
test
,
strlwr
(
dir
.
name
));
/* find the test suffix */
if
((
position
=
strinstr
(
test
,
TEST_SUFFIX
))
!=
0
)
if
(
!
(
dir
.
attrib
&
_A_SUBDIR
))
{
p
=
test
+
position
-
1
;
/* null terminate at the suffix */
*
p
=
0
;
/* insert test */
*
names
=
malloc
(
FN_REFLEN
);
strcpy
(
*
names
,
test
);
names
++
;
name_index
++
;
strcpy
(
test
,
strlwr
(
dir
.
name
));
/* find the test suffix */
if
((
position
=
strinstr
(
test
,
TEST_SUFFIX
))
!=
0
)
{
if
(
name_index
<
MAX_COUNT_TESTES
)
{
/* null terminate at the suffix */
*
(
test
+
position
-
1
)
=
'\0'
;
/* insert test */
*
names
=
malloc
(
FN_REFLEN
);
strcpy
(
*
names
,
test
);
names
++
;
name_index
++
;
}
else
die
(
"can not sort files, array is overloaded"
);
}
}
}
}
while
(
_findnext
(
handle
,
&
dir
)
==
0
);
_findclose
(
handle
);
}
while
(
_findnext
(
handle
,
&
dir
)
==
0
);
_findclose
(
handle
);
}
#endif
qsort
(
(
void
*
)
testes
,
name_index
,
sizeof
(
char
*
),
compare
);
for
(
index
=
0
;
index
<
=
name_index
;
index
++
)
for
(
index
=
0
;
index
<
name_index
;
index
++
)
{
run_test
(
testes
[
index
]);
free
(
testes
[
index
]);
}
free
(
testes
);
#endif
}
/* stop server */
...
...
mysys/mf_keycaches.c
View file @
cc8a3339
...
...
@@ -235,7 +235,7 @@ static my_bool safe_hash_set(SAFE_HASH *hash, const byte *key, uint length,
if
(
my_hash_insert
(
&
hash
->
hash
,
(
byte
*
)
entry
))
{
/* This can only happen if hash got out of memory */
my_
delet
e
((
char
*
)
entry
,
MYF
(
0
));
my_
fre
e
((
char
*
)
entry
,
MYF
(
0
));
error
=
1
;
goto
end
;
}
...
...
mysys/my_sleep.c
View file @
cc8a3339
...
...
@@ -23,6 +23,8 @@ void my_sleep(ulong m_seconds)
{
#ifdef __NETWARE__
delay
(
m_seconds
/
1000
+
1
);
#elif defined(__WIN__)
Sleep
(
m_seconds
/
1000
+
1
);
/* Sleep() has millisecond arg */
#elif defined(OS2)
DosSleep
(
m_seconds
/
1000
+
1
);
#elif defined(HAVE_SELECT)
...
...
scripts/mysqld_safe.sh
View file @
cc8a3339
...
...
@@ -322,13 +322,13 @@ do
# but should work for the rest of the servers.
# The only thing is ps x => redhat 5 gives warnings when using ps -x.
# kill -9 is used or the process won't react on the kill.
numofproces
=
`
ps xa |
grep
-v
"grep"
|
grep
"
$ledir
/
$MYSQLD
\>
"
|
grep
-c
"pid-file=
$pid_file
"
`
numofproces
=
`
ps xa
ww
|
grep
-v
"grep"
|
grep
"
$ledir
/
$MYSQLD
\>
"
|
grep
-c
"pid-file=
$pid_file
"
`
echo
-e
"
\n
Number of processes running now:
$numofproces
"
|
tee
-a
$err_log
I
=
1
while
test
"
$I
"
-le
"
$numofproces
"
do
PROC
=
`
ps xa |
grep
"
$ledir
/
$MYSQLD
\>
"
|
grep
-v
"grep"
|
grep
"pid-file=
$pid_file
"
|
sed
-n
'$p'
`
PROC
=
`
ps xa
ww
|
grep
"
$ledir
/
$MYSQLD
\>
"
|
grep
-v
"grep"
|
grep
"pid-file=
$pid_file
"
|
sed
-n
'$p'
`
for
T
in
$PROC
do
...
...
sql-bench/crash-me.sh
View file @
cc8a3339
...
...
@@ -1039,7 +1039,7 @@ try_and_report("Automatic row id", "automatic_rowid",
[
"MATCH UNIQUE"
,
"match_unique"
,
"1 match unique (select a from crash_me)"
,1,0],
[
"MATCH"
,
"match"
,
"1 match (select a from crash_me)"
,1,0],
[
"MATCHES"
,
"matches"
,
"b matc
j
hes 'a*'"
,1,0],
[
"MATCHES"
,
"matches"
,
"b matches 'a*'"
,1,0],
[
"NOT BETWEEN"
,
"not_between"
,
"7 not between 4 and 6"
,1,0],
[
"NOT EXISTS"
,
"not_exists"
,
"not exists (select * from crash_me where a = 2)"
,1,0],
...
...
sql-common/client.c
View file @
cc8a3339
...
...
@@ -882,7 +882,7 @@ static const char *default_options[]=
"connect-timeout"
,
"local-infile"
,
"disable-local-infile"
,
"replication-probe"
,
"enable-reads-from-master"
,
"repl-parse-query"
,
"ssl-cipher"
,
"max-allowed-packet"
,
"protocol"
,
"shared-memory-base-name"
,
"multi-results"
,
"multi-queries"
,
"secure-auth"
,
"multi-results"
,
"multi-
statements"
,
"multi-
queries"
,
"secure-auth"
,
NullS
};
...
...
@@ -1088,9 +1088,10 @@ void mysql_read_default_options(struct st_mysql_options *options,
options
->
client_flag
|=
CLIENT_MULTI_RESULTS
;
break
;
case
31
:
case
32
:
options
->
client_flag
|=
CLIENT_MULTI_STATEMENTS
|
CLIENT_MULTI_RESULTS
;
break
;
case
3
2
:
/* secure-auth */
case
3
3
:
/* secure-auth */
options
->
secure_auth
=
TRUE
;
break
;
default:
...
...
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