Skip to content

M
mariadb
Commit efaaf0b4 authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files
Options

Updated VC++ project files for 4.0.4 

Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
parent 108f2ccb
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 185 deletions
Docs/manual.texi
View file @ efaaf0b4
...@@ -50453,6 +50453,8 @@ each individual 4.0.x release. ...@@ -50453,6 +50453,8 @@ each individual 4.0.x release.
@itemize @bullet @itemize @bullet
@item @item
One didn't get an error message if mysqld couldn't open the privilege tables.
@item
@code{SET PASSWORD FOR ...} closed the connection in case of errors (bug @code{SET PASSWORD FOR ...} closed the connection in case of errors (bug
from 4.0.3). from 4.0.3).
@item @item
VC++Files/bdb/bdb.dsp
View file @ efaaf0b4
...@@ -61,8 +61,8 @@ LIB32=link.exe -lib ...@@ -61,8 +61,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "bdb___Win32_Max" # PROP Output_Dir "max"
# PROP Intermediate_Dir "bdb___Win32_Max" # PROP Intermediate_Dir "max"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb/include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c # ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb/include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c
# SUBTRACT BASE CPP /Fr # SUBTRACT BASE CPP /Fr
...@@ -88,522 +88,418 @@ LIB32=link.exe -lib ...@@ -88,522 +88,418 @@ LIB32=link.exe -lib
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_compare.c SOURCE=.\btree\bt_compare.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_conv.c SOURCE=.\btree\bt_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_curadj.c SOURCE=.\btree\bt_curadj.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_cursor.c SOURCE=.\btree\bt_cursor.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_delete.c SOURCE=.\btree\bt_delete.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_method.c SOURCE=.\btree\bt_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_open.c SOURCE=.\btree\bt_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_put.c SOURCE=.\btree\bt_put.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_rec.c SOURCE=.\btree\bt_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_reclaim.c SOURCE=.\btree\bt_reclaim.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_recno.c SOURCE=.\btree\bt_recno.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_rsearch.c SOURCE=.\btree\bt_rsearch.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_search.c SOURCE=.\btree\bt_search.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_split.c SOURCE=.\btree\bt_split.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_stat.c SOURCE=.\btree\bt_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_upgrade.c SOURCE=.\btree\bt_upgrade.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\bt_verify.c SOURCE=.\btree\bt_verify.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\btree\btree_auto.c SOURCE=.\btree\btree_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\crdel_auto.c SOURCE=.\db\crdel_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\crdel_rec.c SOURCE=.\db\crdel_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_app.cpp SOURCE=.\cxx\cxx_app.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_except.cpp SOURCE=.\cxx\cxx_except.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_lock.cpp SOURCE=.\cxx\cxx_lock.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_log.cpp SOURCE=.\cxx\cxx_log.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_mpool.cpp SOURCE=.\cxx\cxx_mpool.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_table.cpp SOURCE=.\cxx\cxx_table.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\cxx\cxx_txn.cpp SOURCE=.\cxx\cxx_txn.cpp
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db.c SOURCE=.\db\db.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_am.c SOURCE=.\db\db_am.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_auto.c SOURCE=.\db\db_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\db_byteorder.c SOURCE=.\common\db_byteorder.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_cam.c SOURCE=.\db\db_cam.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_conv.c SOURCE=.\db\db_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_dispatch.c SOURCE=.\db\db_dispatch.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_dup.c SOURCE=.\db\db_dup.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\db_err.c SOURCE=.\common\db_err.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\db_getlong.c SOURCE=.\common\db_getlong.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_iface.c SOURCE=.\db\db_iface.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_join.c SOURCE=.\db\db_join.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\db_log2.c SOURCE=.\common\db_log2.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_meta.c SOURCE=.\db\db_meta.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_method.c SOURCE=.\db\db_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_overflow.c SOURCE=.\db\db_overflow.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_pr.c SOURCE=.\db\db_pr.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_rec.c SOURCE=.\db\db_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_reclaim.c SOURCE=.\db\db_reclaim.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_ret.c SOURCE=.\db\db_ret.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\env\db_salloc.c SOURCE=.\env\db_salloc.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\env\db_shash.c SOURCE=.\env\db_shash.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_upg.c SOURCE=.\db\db_upg.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_upg_opd.c SOURCE=.\db\db_upg_opd.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_vrfy.c SOURCE=.\db\db_vrfy.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\db\db_vrfyutil.c SOURCE=.\db\db_vrfyutil.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\dbm\dbm.c SOURCE=.\dbm\dbm.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\env\env_method.c SOURCE=.\env\env_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\env\env_open.c SOURCE=.\env\env_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\env\env_recover.c SOURCE=.\env\env_recover.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\env\env_region.c SOURCE=.\env\env_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash.c SOURCE=.\hash\hash.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_auto.c SOURCE=.\hash\hash_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_conv.c SOURCE=.\hash\hash_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_dup.c SOURCE=.\hash\hash_dup.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_func.c SOURCE=.\hash\hash_func.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_meta.c SOURCE=.\hash\hash_meta.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_method.c SOURCE=.\hash\hash_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_page.c SOURCE=.\hash\hash_page.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_rec.c SOURCE=.\hash\hash_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_reclaim.c SOURCE=.\hash\hash_reclaim.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_stat.c SOURCE=.\hash\hash_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_upgrade.c SOURCE=.\hash\hash_upgrade.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hash\hash_verify.c SOURCE=.\hash\hash_verify.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\hsearch\hsearch.c SOURCE=.\hsearch\hsearch.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock.c SOURCE=.\lock\lock.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock_conflict.c SOURCE=.\lock\lock_conflict.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock_deadlock.c SOURCE=.\lock\lock_deadlock.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock_method.c SOURCE=.\lock\lock_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock_region.c SOURCE=.\lock\lock_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock_stat.c SOURCE=.\lock\lock_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\lock\lock_util.c SOURCE=.\lock\lock_util.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log.c SOURCE=.\log\log.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_archive.c SOURCE=.\log\log_archive.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_auto.c SOURCE=.\log\log_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_compare.c SOURCE=.\log\log_compare.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_findckp.c SOURCE=.\log\log_findckp.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_get.c SOURCE=.\log\log_get.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_method.c SOURCE=.\log\log_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_put.c SOURCE=.\log\log_put.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_rec.c SOURCE=.\log\log_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\log\log_register.c SOURCE=.\log\log_register.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_alloc.c SOURCE=.\mp\mp_alloc.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_bh.c SOURCE=.\mp\mp_bh.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_fget.c SOURCE=.\mp\mp_fget.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_fopen.c SOURCE=.\mp\mp_fopen.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_fput.c SOURCE=.\mp\mp_fput.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_fset.c SOURCE=.\mp\mp_fset.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_method.c SOURCE=.\mp\mp_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_region.c SOURCE=.\mp\mp_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_register.c SOURCE=.\mp\mp_register.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_stat.c SOURCE=.\mp\mp_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_sync.c SOURCE=.\mp\mp_sync.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mp\mp_trickle.c SOURCE=.\mp\mp_trickle.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mutex\mut_tas.c SOURCE=.\mutex\mut_tas.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\mutex\mutex.c SOURCE=.\mutex\mutex.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_abs.c SOURCE=.\os_win32\os_abs.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -612,22 +508,18 @@ SOURCE=.\os\os_alloc.c ...@@ -612,22 +508,18 @@ SOURCE=.\os\os_alloc.c
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_dir.c SOURCE=.\os_win32\os_dir.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_errno.c SOURCE=.\os_win32\os_errno.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_fid.c SOURCE=.\os_win32\os_fid.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_finit.c SOURCE=.\os_win32\os_finit.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -640,7 +532,6 @@ SOURCE=.\os\os_handle.c ...@@ -640,7 +532,6 @@ SOURCE=.\os\os_handle.c
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_map.c SOURCE=.\os_win32\os_map.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -653,7 +544,6 @@ SOURCE=.\os\os_oflags.c ...@@ -653,7 +544,6 @@ SOURCE=.\os\os_oflags.c
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_open.c SOURCE=.\os_win32\os_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -662,7 +552,6 @@ SOURCE=.\os\os_region.c ...@@ -662,7 +552,6 @@ SOURCE=.\os\os_region.c
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_rename.c SOURCE=.\os_win32\os_rename.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -679,87 +568,70 @@ SOURCE=.\os\os_rw.c ...@@ -679,87 +568,70 @@ SOURCE=.\os\os_rw.c
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_seek.c SOURCE=.\os_win32\os_seek.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_sleep.c SOURCE=.\os_win32\os_sleep.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_spin.c SOURCE=.\os_win32\os_spin.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os\os_stat.c SOURCE=.\os\os_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os\os_tmpdir.c SOURCE=.\os\os_tmpdir.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os_win32\os_type.c SOURCE=.\os_win32\os_type.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\os\os_unlink.c SOURCE=.\os\os_unlink.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam.c SOURCE=.\qam\qam.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_auto.c SOURCE=.\qam\qam_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_conv.c SOURCE=.\qam\qam_conv.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_files.c SOURCE=.\qam\qam_files.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_method.c SOURCE=.\qam\qam_method.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_open.c SOURCE=.\qam\qam_open.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_rec.c SOURCE=.\qam\qam_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_stat.c SOURCE=.\qam\qam_stat.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_upgrade.c SOURCE=.\qam\qam_upgrade.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\qam\qam_verify.c SOURCE=.\qam\qam_verify.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
...@@ -768,47 +640,38 @@ SOURCE=.\clib\strcasecmp.c ...@@ -768,47 +640,38 @@ SOURCE=.\clib\strcasecmp.c
# Begin Source File # Begin Source File
SOURCE=.\txn\txn.c SOURCE=.\txn\txn.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\txn\txn_auto.c SOURCE=.\txn\txn_auto.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\txn\txn_rec.c SOURCE=.\txn\txn_rec.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\txn\txn_region.c SOURCE=.\txn\txn_region.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\util_log.c SOURCE=.\common\util_log.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\common\util_sig.c SOURCE=.\common\util_sig.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xa\xa.c SOURCE=.\xa\xa.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xa\xa_db.c SOURCE=.\xa\xa_db.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\xa\xa_map.c SOURCE=.\xa\xa_map.c
# ADD CPP /I "../bdb/build_win32" /I "../bdb/include"
# End Source File # End Source File
# End Group # End Group
# Begin Group "Header Files" # Begin Group "Header Files"
......
VC++Files/client/mysqlclient.dsp
View file @ efaaf0b4
...@@ -266,6 +266,7 @@ SOURCE=..\mysys\my_alloc.c ...@@ -266,6 +266,7 @@ SOURCE=..\mysys\my_alloc.c
# Begin Source File # Begin Source File
SOURCE=..\mysys\my_compress.c SOURCE=..\mysys\my_compress.c
# ADD CPP /I "../zlib"
# End Source File # End Source File
# Begin Source File # Begin Source File
......
VC++Files/innobase/innobase.dsp
View file @ efaaf0b4
...@@ -37,8 +37,8 @@ RSC=rc.exe ...@@ -37,8 +37,8 @@ RSC=rc.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "innobase___Win32_Debug" # PROP Output_Dir "debug"
# PROP Intermediate_Dir "innobase___Win32_Debug" # PROP Intermediate_Dir "debug"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c # ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
...@@ -60,8 +60,8 @@ LIB32=link.exe -lib ...@@ -60,8 +60,8 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "innobase___Win32_Release0" # PROP Output_Dir "release"
# PROP Intermediate_Dir "innobase___Win32_Release0" # PROP Intermediate_Dir "release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c # ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
......
VC++Files/mysqlbinlog/mysqlbinlog.dsp
View file @ efaaf0b4
...@@ -42,7 +42,7 @@ RSC=rc.exe ...@@ -42,7 +42,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 "../include" /I "../" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../" /I "../sql" /D "NDEBUG" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /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
...@@ -67,7 +67,7 @@ LINK32=link.exe ...@@ -67,7 +67,7 @@ LINK32=link.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 /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c # ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /I "../" /I "../sql" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "MYSQL_SERVER" /FD /c
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -88,7 +88,7 @@ LINK32=link.exe ...@@ -88,7 +88,7 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE=.\mysqlbinlog.cpp SOURCE=..\client\mysqlbinlog.cpp
# End Source File # End Source File
# End Group # End Group
# Begin Group "Header Files" # Begin Group "Header Files"
......
VC++Files/mysys/mysys.dsp
View file @ efaaf0b4
...@@ -26,7 +26,7 @@ CFG=mysys - Win32 Debug ...@@ -26,7 +26,7 @@ CFG=mysys - Win32 Debug
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=xicl6.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "mysys - Win32 Release" !IF "$(CFG)" == "mysys - Win32 Release"
...@@ -49,7 +49,7 @@ RSC=rc.exe ...@@ -49,7 +49,7 @@ RSC=rc.exe
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib_release\mysys.lib" # ADD LIB32 /nologo /out:"..\lib_release\mysys.lib"
...@@ -73,7 +73,7 @@ LIB32=link.exe -lib ...@@ -73,7 +73,7 @@ LIB32=link.exe -lib
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib_debug\mysys.lib" # ADD LIB32 /nologo /out:"..\lib_debug\mysys.lib"
...@@ -86,19 +86,19 @@ LIB32=link.exe -lib ...@@ -86,19 +86,19 @@ LIB32=link.exe -lib
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "mysys___Win32_Max" # PROP Output_Dir "max"
# PROP Intermediate_Dir "mysys___Win32_Max" # PROP Intermediate_Dir "max"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /FD /c
# SUBTRACT BASE CPP /YX # SUBTRACT BASE CPP /YX
# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D "USE_SYMDIR" /FD /c
# SUBTRACT CPP /YX # SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 # ADD BASE RSC /l 0x409
# ADD RSC /l 0x409 # ADD RSC /l 0x409
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib_release\mysys.lib" # ADD BASE LIB32 /nologo /out:"..\lib_release\mysys.lib"
# ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib" # ADD LIB32 /nologo /out:"..\lib_release\mysys-max.lib"
...@@ -283,6 +283,19 @@ SOURCE=.\my_clock.c ...@@ -283,6 +283,19 @@ SOURCE=.\my_clock.c
# Begin Source File # Begin Source File
SOURCE=.\my_compress.c SOURCE=.\my_compress.c
!IF "$(CFG)" == "mysys - Win32 Release"
# ADD CPP /I "../zlib"
!ELSEIF "$(CFG)" == "mysys - Win32 Debug"
# ADD CPP /I "../zlib"
!ELSEIF "$(CFG)" == "mysys - Win32 Max"
!ENDIF
# End Source File # End Source File
# Begin Source File # Begin Source File
......
VC++Files/perror/perror.dsp
View file @ efaaf0b4
...@@ -43,7 +43,8 @@ RSC=rc.exe ...@@ -43,7 +43,8 @@ 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 "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX- /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD BASE RSC /l 0x409 /d "NDEBUG"
...@@ -70,7 +71,8 @@ LINK32=link.exe ...@@ -70,7 +71,8 @@ LINK32=link.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 "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /GX- /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c # ADD CPP /nologo /G6 /MTd /W3 /Gm /ZI /Od /I "../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD BASE RSC /l 0x409 /d "_DEBUG"
......
VC++Files/sql/mysqld.dsp
View file @ efaaf0b4
...@@ -28,7 +28,7 @@ CFG=mysqld - Win32 Release ...@@ -28,7 +28,7 @@ CFG=mysqld - Win32 Release
# PROP AllowPerConfigDependencies 0 # PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "" # PROP Scc_ProjName ""
# PROP Scc_LocalPath "" # PROP Scc_LocalPath ""
CPP=cl.exe CPP=xicl6.exe
RSC=rc.exe RSC=rc.exe
!IF "$(CFG)" == "mysqld - Win32 Release" !IF "$(CFG)" == "mysqld - Win32 Release"
...@@ -52,7 +52,7 @@ RSC=rc.exe ...@@ -52,7 +52,7 @@ RSC=rc.exe
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-opt.exe" # 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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-opt.exe"
# SUBTRACT LINK32 /debug # SUBTRACT LINK32 /debug
...@@ -78,7 +78,7 @@ LINK32=link.exe ...@@ -78,7 +78,7 @@ LINK32=link.exe
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld.exe" /pdbtype:sept # 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 Wsock32.lib ..\lib_debug\dbug.lib ..\lib_debug\vio.lib ..\lib_debug\isam.lib ..\lib_debug\merge.lib ..\lib_debug\mysys.lib ..\lib_debug\strings.lib ..\lib_debug\regex.lib ..\lib_debug\heap.lib ..\lib_debug\bdb.lib ..\lib_debug\innodb.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"../client_debug/mysqld.exe" /pdbtype:sept
...@@ -92,8 +92,8 @@ LINK32=link.exe ...@@ -92,8 +92,8 @@ LINK32=link.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "NT" # PROP Output_Dir "nt"
# PROP Intermediate_Dir "NT" # PROP Intermediate_Dir "nt"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# 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
...@@ -105,7 +105,7 @@ LINK32=link.exe ...@@ -105,7 +105,7 @@ LINK32=link.exe
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 Wsock32.lib ..\lib_release\dbug.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /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 Wsock32.lib ..\lib_release\dbug.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /debug /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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe" # 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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe"
# SUBTRACT LINK32 /pdb:none /debug # SUBTRACT LINK32 /pdb:none /debug
...@@ -120,8 +120,8 @@ LINK32=link.exe ...@@ -120,8 +120,8 @@ LINK32=link.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "mysqld___Win32_Max_nt" # PROP Output_Dir "max_nt"
# PROP Intermediate_Dir "mysqld___Win32_Max_nt" # PROP Intermediate_Dir "max_nt"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# 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
...@@ -133,7 +133,7 @@ LINK32=link.exe ...@@ -133,7 +133,7 @@ LINK32=link.exe
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.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 Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-nt.exe"
# SUBTRACT BASE LINK32 /pdb:none /debug # SUBTRACT BASE LINK32 /pdb:none /debug
# 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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-max-nt.exe" # 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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\zlib.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib /nologo /subsystem:console /map /machine:I386 /out:"../client_release/mysqld-max-nt.exe"
...@@ -149,8 +149,8 @@ LINK32=link.exe ...@@ -149,8 +149,8 @@ LINK32=link.exe
# PROP BASE Target_Dir "" # PROP BASE Target_Dir ""
# PROP Use_MFC 0 # PROP Use_MFC 0
# PROP Use_Debug_Libraries 0 # PROP Use_Debug_Libraries 0
# PROP Output_Dir "mysqld___Win32_Max" # PROP Output_Dir "max"
# PROP Intermediate_Dir "mysqld___Win32_Max" # PROP Intermediate_Dir "max"
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# 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
...@@ -162,7 +162,7 @@ LINK32=link.exe ...@@ -162,7 +162,7 @@ LINK32=link.exe
BSC32=bscmake.exe BSC32=bscmake.exe
# ADD BASE BSC32 /nologo # ADD BASE BSC32 /nologo
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe 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 Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"../client_release/mysqld-opt.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 Wsock32.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\mysys.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib /nologo /subsystem:console /pdb:none /debug /machine:I386 /out:"../client_release/mysqld-opt.exe"
# 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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-max.exe" # 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 Wsock32.lib ..\lib_release\vio.lib ..\lib_release\isam.lib ..\lib_release\merge.lib ..\lib_release\myisam.lib ..\lib_release\myisammrg.lib ..\lib_release\mysys-max.lib ..\lib_release\strings.lib ..\lib_release\regex.lib ..\lib_release\heap.lib ..\lib_release\innodb.lib ..\lib_release\bdb.lib ..\lib_release\zlib.lib /nologo /subsystem:console /pdb:none /machine:I386 /out:"../client_release/mysqld-max.exe"
# SUBTRACT LINK32 /debug # SUBTRACT LINK32 /debug
......
client/mysqldump.c
View file @ efaaf0b4
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
** Added --single-transaction option 06/06/2002 by Peter Zaitsev ** Added --single-transaction option 06/06/2002 by Peter Zaitsev
*/ */
#define DUMP_VERSION "9.06" #define DUMP_VERSION "9.07"
#include <my_global.h> #include <my_global.h>
#include <my_sys.h> #include <my_sys.h>
...@@ -263,22 +263,34 @@ static void print_version(void) ...@@ -263,22 +263,34 @@ static void print_version(void)
} /* print_version */ } /* print_version */
static void short_usage_sub(void)
{
printf("Usage: %s [OPTIONS] database [tables]\n", my_progname);
printf("OR %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",
my_progname);
printf("OR %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname);
}
static void usage(void) static void usage(void)
{ {
print_version(); print_version();
puts("By Igor Romanenko, Monty, Jani & Sinisa"); puts("By Igor Romanenko, Monty, Jani & Sinisa");
puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n"); puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
puts("Dumping definition and data mysql database or table"); puts("Dumping definition and data mysql database or table");
printf("Usage: %s [OPTIONS] database [tables]\n", my_progname); short_usage_sub();
printf("OR %s [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]\n",
my_progname);
printf("OR %s [OPTIONS] --all-databases [OPTIONS]\n", my_progname);
print_defaults("my",load_default_groups); print_defaults("my",load_default_groups);
my_print_help(my_long_options); my_print_help(my_long_options);
my_print_variables(my_long_options); my_print_variables(my_long_options);
} /* usage */ } /* usage */
static void short_usage(void)
{
short_usage_sub();
printf("For more options, use %s --help\n", my_progname);
}
static void write_header(FILE *sql_file, char *db_name) static void write_header(FILE *sql_file, char *db_name)
{ {
if (opt_xml) if (opt_xml)
...@@ -408,7 +420,7 @@ static int get_options(int *argc, char ***argv) ...@@ -408,7 +420,7 @@ static int get_options(int *argc, char ***argv)
} }
if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs)) if ((*argc < 1 && !opt_alldbs) || (*argc > 0 && opt_alldbs))
{ {
usage(); short_usage();
return 1; return 1;
} }
if (tty_password) if (tty_password)
......
include/config-win.h
View file @ efaaf0b4
...@@ -259,6 +259,7 @@ inline double ulonglong2double(ulonglong value) ...@@ -259,6 +259,7 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_ISNAN #define HAVE_ISNAN
#define HAVE_FINITE #define HAVE_FINITE
#define HAVE_ISAM /* We want to have support for ISAM in 4.0 */ #define HAVE_ISAM /* We want to have support for ISAM in 4.0 */
#define HAVE_QUERY_CACHE
#define SPRINTF_RETURNS_INT #define SPRINTF_RETURNS_INT
#ifdef NOT_USED #ifdef NOT_USED
......
libmysql/libmysql.def
View file @ efaaf0b4
LIBRARY LIBMYSQL LIBRARY LIBMYSQL
DESCRIPTION 'MySQL 4.0 Client Library' DESCRIPTION 'MySQL 4.0 Client Library'
VERSION 4.0 VERSION 5.0
EXPORTS EXPORTS
mysql_affected_rows mysql_affected_rows
mysql_close mysql_close
mysql_connect
mysql_create_db
mysql_data_seek mysql_data_seek
mysql_debug mysql_debug
mysql_drop_db
mysql_dump_debug_info mysql_dump_debug_info
mysql_eof mysql_eof
mysql_errno mysql_errno
......
sql/ha_innodb.cc
View file @ efaaf0b4
...@@ -571,10 +571,12 @@ innobase_invalidate_query_cache( ...@@ -571,10 +571,12 @@ innobase_invalidate_query_cache(
chars count */ chars count */
{ {
/* Argument TRUE below means we are using transactions */ /* Argument TRUE below means we are using transactions */
#ifdef HAVE_QUERY_CACHE
query_cache.invalidate((THD*)(trx->mysql_thd), query_cache.invalidate((THD*)(trx->mysql_thd),
(const char*)full_name, (const char*)full_name,
(uint32)full_name_len, (uint32)full_name_len,
TRUE); TRUE);
#endif
} }
} }
......
sql/set_var.cc
View file @ efaaf0b4
...@@ -1298,7 +1298,6 @@ int set_var::check(THD *thd) ...@@ -1298,7 +1298,6 @@ int set_var::check(THD *thd)
int set_var::update(THD *thd) int set_var::update(THD *thd)
{ {
int error;
if (!value) if (!value)
var->set_default(thd, type); var->set_default(thd, type);
else if (var->update(thd, this)) else if (var->update(thd, this))
......
sql/sql_acl.cc
View file @ efaaf0b4
...@@ -165,14 +165,21 @@ my_bool acl_init(bool dont_read_acl_tables) ...@@ -165,14 +165,21 @@ my_bool acl_init(bool dont_read_acl_tables)
tables[0].db=tables[1].db=tables[2].db=thd->db; tables[0].db=tables[1].db=tables[2].db=thd->db;
if (open_tables(thd,tables)) if (open_tables(thd,tables))
{
sql_print_error("Fatal error: Can't open privilege tables: %s",
thd->net.last_error);
goto end; goto end;
}
TABLE *ptr[3]; // Lock tables for quick update TABLE *ptr[3]; // Lock tables for quick update
ptr[0]= tables[0].table; ptr[0]= tables[0].table;
ptr[1]= tables[1].table; ptr[1]= tables[1].table;
ptr[2]= tables[2].table; ptr[2]= tables[2].table;
if (!(lock=mysql_lock_tables(thd,ptr,3))) if (!(lock=mysql_lock_tables(thd,ptr,3)))
{
sql_print_error("Fatal error: Can't lock privilege tables: %s",
thd->net.last_error);
goto end; goto end;
}
init_sql_alloc(&mem,1024,0); init_sql_alloc(&mem,1024,0);
init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0); init_read_record(&read_record_info,thd,table= tables[0].table,NULL,1,0);
VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50)); VOID(my_init_dynamic_array(&acl_hosts,sizeof(ACL_HOST),20,50));
......
sql/sql_cache.h
View file @ efaaf0b4
...@@ -170,16 +170,16 @@ struct Query_cache_result ...@@ -170,16 +170,16 @@ struct Query_cache_result
}; };
extern "C" { extern "C"
{
byte *query_cache_query_get_key(const byte *record, uint *length, byte *query_cache_query_get_key(const byte *record, uint *length,
my_bool not_used); my_bool not_used);
byte *query_cache_table_get_key(const byte *record, uint *length, byte *query_cache_table_get_key(const byte *record, uint *length,
my_bool not_used); my_bool not_used);
void query_cache_insert(THD *thd, const char *packet, ulong length);
void query_cache_end_of_result(THD *thd);
void query_cache_abort(THD *thd);
void query_cache_invalidate_by_MyISAM_filename(const char* filename);
} }
void query_cache_insert(NET *thd, const char *packet, ulong length);
void query_cache_invalidate_by_MyISAM_filename(const char* filename);
struct Query_cache_memory_bin struct Query_cache_memory_bin
{ {
...@@ -401,7 +401,6 @@ protected: ...@@ -401,7 +401,6 @@ protected:
extern Query_cache query_cache; extern Query_cache query_cache;
extern TYPELIB query_cache_type_typelib; extern TYPELIB query_cache_type_typelib;
void query_cache_insert(NET *net, const char *packet, ulong length);
void query_cache_end_of_result(NET *net); void query_cache_end_of_result(NET *net);
void query_cache_abort(NET *net); void query_cache_abort(NET *net);
......
sql/sql_class.cc
View file @ efaaf0b4
...@@ -109,6 +109,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0), ...@@ -109,6 +109,7 @@ THD::THD():user_time(0),fatal_error(0),last_insert_id_used(0),
dbug_sentry=THD_SENTRY_MAGIC; dbug_sentry=THD_SENTRY_MAGIC;
#endif #endif
net.vio=0; net.vio=0;
net.last_error[0]=0; // If error on boot
ull=0; ull=0;
system_thread=cleanup_done=0; system_thread=cleanup_done=0;
transaction.changed_tables = 0; transaction.changed_tables = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7