Skip to content

M
MariaDB
Commit 9c81773b authored by unknown's avatar unknown
Browse files
Options

Merge mysql.com:/home/jimw/my/mysql-5.1-release 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/alter_table.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/show_check.result:
  Resolve conflict
sql/authors.h:
  Resolve conflicts, update replication/backup developers
parents 8486e64f b6547d09
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1887 additions and 834 deletions
VC++Files/libmysqld/libmysqld.vcproj
View file @ 9c81773b
This source diff could not be displayed because it is too large. You can view the blob instead.
VC++Files/myisam_ftdump/myisam_ftdump.vcproj
View file @ 9c81773b
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/myisam_ftdump.pch" PrecompiledHeaderFile=".\debug/myisam_ftdump.pch"
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
......
VC++Files/myisamchk/myisamchk.vcproj
View file @ 9c81773b
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS" PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG" PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/myisamchk.pch" PrecompiledHeaderFile=".\debug/myisamchk.pch"
......
VC++Files/myisamlog/myisamlog.vcproj
View file @ 9c81773b
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\Debug/myisamlog.pch" PrecompiledHeaderFile=".\Debug/myisamlog.pch"
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG" PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS" PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
......
VC++Files/myisampack/myisampack.vcproj
View file @ 9c81773b
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/myisampack.pch" PrecompiledHeaderFile=".\debug/myisampack.pch"
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS" PreprocessorDefinitions="NDEBUG;DBUG_OFF;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../storage/myisam" AdditionalIncludeDirectories="../include,../myisam"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG" PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
......
VC++Files/mysql.sln
View file @ 9c81773b
This diff is collapsed.
VC++Files/mysqldemb/mysqldemb.vcproj
View file @ 9c81773b
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib"
PreprocessorDefinitions="WIN32;_LIB;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;USE_SYMDIR;MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE" PreprocessorDefinitions="WIN32;_LIB;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;USE_SYMDIR;MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../zlib,../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32" AdditionalIncludeDirectories="../zlib,../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;USE_TLS;__WIN__" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\Debug/mysqldemb.pch" PrecompiledHeaderFile=".\Debug/mysqldemb.pch"
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32,../zlib" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32,../zlib"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
...@@ -473,7 +473,8 @@ ...@@ -473,7 +473,8 @@
<File <File
RelativePath="..\sql\ha_innodb.cpp"> RelativePath="..\sql\ha_innodb.cpp">
<FileConfiguration <FileConfiguration
Name="classic|Win32"> Name="classic|Win32"
ExcludedFromBuild="TRUE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="2"
......
VC++Files/mysqlserver/mysqlserver.vcproj
View file @ 9c81773b
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,libmysqld" AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,libmysqld"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;WITH_BERKELEY_STORAGE_ENGINE;WITH_INNOBASE_STORAGE_ENGINE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,../libmysqld" AdditionalIncludeDirectories="../include,../regex,../sql,../storage/bdb/build_win32,../libmysqld"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_BERKELEY_DB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_BERKELEY_DB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;WITH_BERKELEY_STORAGE_ENGINE;WITH_INNOBASE_STORAGE_ENGINE"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
......
VC++Files/sql/mysqld.vcproj
View file @ 9c81773b
This diff is collapsed.
VC++Files/storage/bdb/bdb.vcproj
View file @ 9c81773b
This diff is collapsed.
VC++Files/storage/myisam/myisam.vcproj
View file @ 9c81773b
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_Debug\myisam.lib" OutputFile="..\lib_debug\myisam.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_Debug\myisam_tls.lib" OutputFile="..\lib_debug\myisam_tls.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
......
VC++Files/storage/myisammrg/myisammrg.vcproj
View file @ 9c81773b
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_Debug\myisammrg_tls.lib" OutputFile="..\lib_debug\myisammrg_tls.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_Debug\myisammrg.lib" OutputFile="..\lib_debug\myisammrg.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
......
VC++Files/strings/strings.vcproj
View file @ 9c81773b
...@@ -683,6 +683,25 @@ ...@@ -683,6 +683,25 @@
PreprocessorDefinitions=""/> PreprocessorDefinitions=""/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="my_strchr.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File>
<File <File
RelativePath="my_strtoll10.c"> RelativePath="my_strtoll10.c">
<FileConfiguration <FileConfiguration
......
extra/yassl/Makefile.am
View file @ 9c81773b
SUBDIRS = taocrypt src SUBDIRS = taocrypt src
EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp)
extra/yassl/taocrypt/Makefile.am
View file @ 9c81773b
SUBDIRS = src SUBDIRS = src
EXTRA_DIST = taocrypt.dsw taocrypt.dsp EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj
mysql-test/mysql-test-run.pl
View file @ 9c81773b
...@@ -927,6 +927,9 @@ sub executable_setup () { ...@@ -927,6 +927,9 @@ sub executable_setup () {
"$path_client_bindir/mysqld-debug",); "$path_client_bindir/mysqld-debug",);
$path_language= mtr_path_exists("$glob_basedir/share/english/"); $path_language= mtr_path_exists("$glob_basedir/share/english/");
$path_charsetsdir= mtr_path_exists("$glob_basedir/share/charsets"); $path_charsetsdir= mtr_path_exists("$glob_basedir/share/charsets");
$exe_my_print_defaults=
mtr_exe_exists("$path_client_bindir/my_print_defaults");
} }
else else
{ {
...@@ -937,6 +940,8 @@ sub executable_setup () { ...@@ -937,6 +940,8 @@ sub executable_setup () {
$exe_im= mtr_exe_exists( $exe_im= mtr_exe_exists(
"$glob_basedir/server-tools/instance-manager/mysqlmanager"); "$glob_basedir/server-tools/instance-manager/mysqlmanager");
$exe_my_print_defaults=
mtr_exe_exists("$glob_basedir/extra/my_print_defaults");
} }
if ( $glob_use_embedded_server ) if ( $glob_use_embedded_server )
...@@ -963,8 +968,6 @@ sub executable_setup () { ...@@ -963,8 +968,6 @@ sub executable_setup () {
$exe_mysql= mtr_exe_exists("$path_client_bindir/mysql"); $exe_mysql= mtr_exe_exists("$path_client_bindir/mysql");
$exe_mysql_fix_system_tables= $exe_mysql_fix_system_tables=
mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables"); mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
$exe_my_print_defaults=
mtr_script_exists("$glob_basedir/extra/my_print_defaults");
$path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools"); $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
$exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm"; $exe_ndb_mgm= "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
} }
...@@ -982,7 +985,7 @@ sub executable_setup () { ...@@ -982,7 +985,7 @@ sub executable_setup () {
mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables", mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",
"$glob_basedir/scripts/mysql_fix_privilege_tables"); "$glob_basedir/scripts/mysql_fix_privilege_tables");
$exe_my_print_defaults= $exe_my_print_defaults=
mtr_script_exists("$path_client_bindir/my_print_defaults"); mtr_exe_exists("$path_client_bindir/my_print_defaults");
$path_language= mtr_path_exists("$glob_basedir/share/mysql/english/", $path_language= mtr_path_exists("$glob_basedir/share/mysql/english/",
"$glob_basedir/share/english/"); "$glob_basedir/share/english/");
......
mysql-test/r/show_check.result
View file @ 9c81773b
...@@ -565,25 +565,4 @@ DROP TABLE urkunde; ...@@ -565,25 +565,4 @@ DROP TABLE urkunde;
SHOW TABLES FROM non_existing_database; SHOW TABLES FROM non_existing_database;
ERROR 42000: Unknown database 'non_existing_database' ERROR 42000: Unknown database 'non_existing_database'
SHOW AUTHORS; SHOW AUTHORS;
Name Location Comment End of 5.1 tests
Brian "Krow" Aker Seattle, WA. USA Architecture, archive, federated, buncha of little stuff :)
David Axmark Uppsala, Sweden Small stuff long time ago, Monty ripped it out!
Omer BarNir Sunnyvale, CA. USA Testing (sometimes) and general QA stuff
Reggie Burnett Nashville, TN. USA Windows Server, Connectors
Alexey Botchkov (Holyfoot) Izhevsk Russia GIS extentions (4.1), Embedded Server (4.1), precision math (5.0)
Oleksandr Byelkin Lugansk, Ukraine Query Cache (4.0), Subqueries (4.1), Views (5.0)
Petr Chardin Moscow, Russia Instance Manager (5.0)
Nikolay Grishakin Austin, TX. USA Testing - Server
Eric Herman Amsterdam, Netherlands Bugfixing - federated
Serge Kozlov Velikie Luki, Russia Testing - Cluster
Matthias Leich Berlin, Germany Testing - Server
Dmitri Lenev Moscow, Russia Time zones support (4.1), Triggers (5.0)
Per-Erik Martin Uppsala, Sweden Stored Procedures (5.0)
Jonathan (Jeb) Miller Kyle, TX. USA Testing - Cluster, Replication
Alexander Nozdrin Moscow, Russia Bugfixing (Stored Procedures, 5.0)
Konstantin Osipov Moscow, Russia Prepared statements (4.1), Cursors (5.0)
Carsten Segieth (Pino) Fredersdorf, Germany Testing - Server
Punita Srivastava Austin, TX. USA Testing - Merlin
Alexey Stroganov (Ranger) Lugansk, Ukraine Testing - Benchmarks
Lars Thalmann Stockholm, Sweden Replication and Cluster development
Sergey Vojtovich Izhevsk, Russia Plugins infrastructure (5.1)
mysql-test/t/show_check.test
View file @ 9c81773b
...@@ -426,5 +426,9 @@ DROP TABLE urkunde; ...@@ -426,5 +426,9 @@ DROP TABLE urkunde;
SHOW TABLES FROM non_existing_database; SHOW TABLES FROM non_existing_database;
# End of 4.1 tests # End of 4.1 tests
#
--disable_result_log
SHOW AUTHORS; SHOW AUTHORS;
--enable_result_log
--echo End of 5.1 tests
mysql-test/t/trigger-compat.test
View file @ 9c81773b
...@@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1 ...@@ -61,7 +61,7 @@ CREATE TRIGGER wl2818_trg1 BEFORE INSERT ON t1
--echo --echo
--echo ---> patching t1.TRG... --echo ---> patching t1.TRG...
--exec grep --text -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec grep -v 'definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
# #
......
mysql-test/t/trigger-grant.test
View file @ 9c81773b
...@@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1 ...@@ -449,7 +449,7 @@ CREATE TRIGGER trg5 BEFORE DELETE ON t1
FOR EACH ROW FOR EACH ROW
SET @a = 5; SET @a = 5;
--exec egrep --text -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec egrep -v '^definers=' $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG > $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG --exec echo "definers='' '@' '@abc@def@@' '@hostname' '@abcdef@@@hostname'" >> $MYSQL_TEST_DIR/var/tmp/t1.TRG
--exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG --exec mv $MYSQL_TEST_DIR/var/tmp/t1.TRG $MYSQL_TEST_DIR/var/master-data/mysqltest_db1/t1.TRG
......
sql/Makefile.am
View file @ 9c81773b
...@@ -118,7 +118,7 @@ DEFS = -DMYSQL_SERVER \ ...@@ -118,7 +118,7 @@ DEFS = -DMYSQL_SERVER \
@DEFS@ @DEFS@
BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h
EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) EXTRA_DIST = udf_example.cc handlerton-win.cc $(BUILT_SOURCES)
DISTCLEANFILES = lex_hash.h DISTCLEANFILES = lex_hash.h
AM_YFLAGS = -d AM_YFLAGS = -d
......
sql/authors.h
View file @ 9c81773b
/*************************************************************************** /* Copyright (C) 2005 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
** Output from "SHOW AUTHORS"
** If you can update it, you get to be in it :) This program is free software; you can redistribute it and/or modify
** Dont be offended if your name is not in here, just add it! it under the terms of the GNU General Public License as published by
** IMPORTANT: Names should be added in alphabetical order the Free Software Foundation; either version 2 of the License, or
***************************************************************************/ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
/* Structure of the name list */
struct show_table_authors_st { struct show_table_authors_st {
const char *name; const char *name;
...@@ -11,28 +22,124 @@ struct show_table_authors_st { ...@@ -11,28 +22,124 @@ struct show_table_authors_st {
const char *comment; const char *comment;
}; };
/*
Output from "SHOW AUTHORS"
If you can update it, you get to be in it :)
Don't be offended if your name is not in here, just add it!
IMPORTANT: Names should be added in alphabetical order (by last name).
Names should be encoded using UTF-8.
*/
struct show_table_authors_st show_table_authors[]= { struct show_table_authors_st show_table_authors[]= {
{ "Brian \"Krow\" Aker", "Seattle, WA. USA", { "Brian (Krow) Aker", "Seattle, WA, USA",
"Architecture, archive, federated, buncha of little stuff :)" }, "Architecture, archive, federated, bunch of little stuff :)" },
{ "David Axmark", "Uppsala, Sweden", "Small stuff long time ago, Monty ripped it out!"}, { "Venu Anuganti", "", "Client/server protocol (4.1)" },
{ "Omer BarNir", "Sunnyvale, CA. USA", "Testing (sometimes) and general QA stuff"}, { "David Axmark", "Uppsala, Sweden",
{ "Reggie Burnett", "Nashville, TN. USA", "Windows Server, Connectors" }, "Small stuff long time ago, Monty ripped it out!" },
{ "Alexey Botchkov (Holyfoot)", "Izhevsk Russia", "GIS extentions (4.1), Embedded Server (4.1), precision math (5.0)"}, { "Alexander (Bar) Barkov", "Izhevsk, Russia",
{ "Oleksandr Byelkin", "Lugansk, Ukraine", "Query Cache (4.0), Subqueries (4.1), Views (5.0)"}, "Unicode and character sets (4.1)" },
{ "Omer BarNir", "Sunnyvale, CA, USA",
"Testing (sometimes) and general QA stuff" },
{ "Guilhem Bichot", "Bordeaux, France", "Replication (since 4.0)" },
{ "John Birrell", "", "Emulation of pthread_mutex() for OS/2" },
{ "Andreas F. Bobak", "", "AGGREGATE extension to user-defined functions" },
{ "Alexey Botchkov (Holyfoot)", "Izhevsk, Russia",
"GIS extensions (4.1), embedded server (4.1), precision math (5.0)"},
{ "Reggie Burnett", "Nashville, TN, USA", "Windows development, Connectors" },
{ "Oleksandr Byelkin", "Lugansk, Ukraine",
"Query Cache (4.0), Subqueries (4.1), Views (5.0)" },
{ "Kent Boortz", "Orebro, Sweden", "Test platform, and general build stuff" },
{ "Tim Bunce", "", "mysqlhotcopy" },
{ "Yves Carlier", "", "mysqlaccess" },
{ "Joshua Chamas", "Cupertino, CA, USA",
"Concurrent insert, extended date syntax" },
{ "Petr Chardin", "Moscow, Russia", "Instance Manager (5.0)" }, { "Petr Chardin", "Moscow, Russia", "Instance Manager (5.0)" },
{ "Nikolay Grishakin", "Austin, TX. USA", "Testing - Server"}, { "Wei-Jou Chen", "", "Chinese (Big5) character set" },
{ "Eric Herman", "Amsterdam, Netherlands", "Bugfixing - federated" }, { "Albert Chin-A-Young", "",
{ "Serge Kozlov", "Velikie Luki, Russia", "Testing - Cluster"}, "Tru64 port, large file support, better TCP wrappers support" },
{ "Matthias Leich", "Berlin, Germany", "Testing - Server"}, { "Jorge del Conde", "Mexico City, Mexico", "Windows development" },
{ "Dmitri Lenev", "Moscow, Russia", "Time zones support (4.1), Triggers (5.0)"}, { "Antony T. Curtis", "Norwalk, CA, USA", "Parser, port to OS/2" },
{ "Yuri Dario", "", "OS/2 port" },
{ "Sergei Golubchik", "Kerpen, Germany",
"Full-text search, precision math" },
{ "Lenz Grimmer", "Hamburg, Germany",
"Production (build and release) engineering" },
{ "Nikolay Grishakin", "Austin, TX, USA", "Testing - Server" },
{ "Wei He", "", "Chinese (GBK) character set" },
{ "Eric Herman", "Amsterdam, Netherlands", "Bug fixing - federated" },
{ "Alexander (Alexi) Ivanov", "St. Petersburg, Russia", "Replication" },
{ "Alexander (Salle) Keremidarski", "Sofia, Bulgaria",
"Bug fixing" },
{ "Mats Kindahl", "Storvreta, Sweden", "Replication" },
{ "Serge Kozlov", "Velikie Luki, Russia", "Testing - Cluster" },
{ "Greg (Groggy) Lehey", "Uchunga, SA, Australia", "Backup" },
{ "Matthias Leich", "Berlin, Germany", "Testing - Server" },
{ "Dmitri Lenev", "Moscow, Russia",
"Time zones support (4.1), Triggers (5.0)" },
{ "Marc Liyanage", "", "Created Mac OS X packages" },
{ "Zarko Mocnik", "", "Sorting for Slovenian language" },
{ "Per-Erik Martin", "Uppsala, Sweden", "Stored Procedures (5.0)" }, { "Per-Erik Martin", "Uppsala, Sweden", "Stored Procedures (5.0)" },
{ "Jonathan (Jeb) Miller", "Kyle, TX. USA", "Testing - Cluster, Replication"}, { "Alexis Mikhailov", "", "User-defined functions" },
{ "Alexander Nozdrin", "Moscow, Russia", "Bugfixing (Stored Procedures, 5.0)" }, { "Sinisa Milivojevic", "Larnaca, Cyprus",
{ "Konstantin Osipov", "Moscow, Russia", "Prepared statements (4.1), Cursors (5.0)"}, "UNION (4.0), Subqueries in FROM clause (4.1), many other features" },
{ "Jonathan (Jeb) Miller", "Kyle, TX, USA",
"Testing - Cluster, Replication" },
{ "Elliot Murphy", "Cocoa, FL, USA", "Replication and backup" },
{ "Kristian Nielsen", "Copenhagen, Denmark",
"General build stuff" },
{ "Pekka Nouisiainen", "Stockholm, Sweden",
"NDB Cluster: BLOB support, character set support, ordered indexes" },
{ "Alexander Nozdrin", "Moscow, Russia",
"Bug fixing (Stored Procedures, 5.0)" },
{ "Per Eric Olsson", "", "Testing of dynamic record format" },
{ "Jonas Oreland", "Stockholm, Sweden",
"NDB Cluster, Online Backup, lots of other things" },
{ "Konstantin Osipov", "Moscow, Russia",
"Prepared statements (4.1), Cursors (5.0)" },
{ "Alexander (Sasha) Pachev", "Provo, UT, USA",
"Statement-based replication, SHOW CREATE TABLE, mysql-bench" },
{ "Irena Pancirov", "", "Port to Windows with Borland compiler" },
{ "Jan Pazdziora", "", "Czech sorting order" },
{ "Benjamin Pflugmann", "",
"Extended MERGE storage engine to handle INSERT" },
{ "Igor Romanenko", "",
"mysqldump" },
{ "Mikael Ronström", "Stockholm, Sweden",
"NDB Cluster, Partitioning (5.1), Optimizations" },
{ "Tõnu Samuel", "",
"VIO interface, other miscellaneous features" },
{ "Carsten Segieth (Pino)", "Fredersdorf, Germany", "Testing - Server"}, { "Carsten Segieth (Pino)", "Fredersdorf, Germany", "Testing - Server"},
{ "Punita Srivastava", "Austin, TX. USA", "Testing - Merlin"}, { "Martin Sköld", "Stockholm, Sweden",
"NDB Cluster: Unique indexes, integration into MySQL" },
{ "Timothy Smith", "Auckland, New Zealand",
"Dynamic character sets, parts of the build system, libmysqld"},
{ "Miguel Solorzano", "Florianopolis, Santa Catarina, Brazil",
"Windows development, Windows NT service"},
{ "Punita Srivastava", "Austin, TX, USA", "Testing - Merlin"},
{ "Alexey Stroganov (Ranger)", "Lugansk, Ukraine", "Testing - Benchmarks"}, { "Alexey Stroganov (Ranger)", "Lugansk, Ukraine", "Testing - Benchmarks"},
{ "Lars Thalmann", "Stockholm, Sweden", "Replication and Cluster development" }, { "Ingo Strüwing", "Berlin, Germany", "Bug fixing" },
{ "Magnus Svensson", "Öregrund, Sweden",
"NDB Cluster: Integration into MySQL, test framework" },
{ "Zeev Suraski", "", "FROM_UNIXTIME(), ENCRYPT()" },
{ "TAMITO", "",
"The _MB character set macros and UJIS and SJIS character sets" },
{ "Jani Tolonen", "Helsinki, Finland",
"mysqlimport, extensions to command-line clients, PROCEDURE ANALYSE()" },
{ "Lars Thalmann", "Stockholm, Sweden",
"Replication and cluster development" },
{ "Tomas Ulin", "Stockholm, Sweden",
"NDB Cluster: Configuration, installation" },
{ "Gianmassimo Vigazzola", "", "Initial Windows port" },
{ "Sergey Vojtovich", "Izhevsk, Russia", "Plugins infrastructure (5.1)" }, { "Sergey Vojtovich", "Izhevsk, Russia", "Plugins infrastructure (5.1)" },
{ "Matt Wagner", "Northfield, MN, USA", "Bug fixing" },
{ "Jim Winstead Jr.", "Los Angeles, CA, USA", "Bug fixing" },
{ "Michael (Monty) Widenius", "Tusby, Finland",
"Lead developer and main author" },
{ "Peter Zaitsev", "Tacoma, WA, USA",
"SHA1(), AES_ENCRYPT(), AES_DECRYPT(), bug fixing" },
{NULL, NULL, NULL} {NULL, NULL, NULL}
}; };
sql/ha_partition.cc
View file @ 9c81773b
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#pragma implementation // gcc: Class implementation #pragma implementation // gcc: Class implementation
#endif #endif
#include <mysql_priv.h> #include "mysql_priv.h"
#include "ha_partition.h" #include "ha_partition.h"
......
sql/handlerton-win.cc 0 → 100644
View file @ 9c81773b
#include "mysql_priv.h"
extern handlerton heap_hton;
extern handlerton myisam_hton;
extern handlerton myisammrg_hton;
extern handlerton binlog_hton;
#ifdef WITH_INNOBASE_STORAGE_ENGINE
extern handlerton innobase_hton;
#endif
#ifdef WITH_BERKELEY_STORAGE_ENGINE
extern handlerton berkeley_hton;
#endif
#ifdef WITH_EXAMPLE_STORAGE_ENGINE
extern handlerton example_hton;
#endif
#ifdef WITH_ARCHIVE_STORAGE_ENGINE
extern handlerton archive_hton;
#endif
#ifdef WITH_CSV_STORAGE_ENGINE
extern handlerton tina_hton;
#endif
#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
extern handlerton blackhole_hton;
#endif
#ifdef WITH_FEDERATED_STORAGE_ENGINE
extern handlerton federated_hton;
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
extern handlerton ndbcluster_hton;
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
extern handlerton partition_hton;
#endif
/*
This array is used for processing compiled in engines.
*/
handlerton *sys_table_types[]=
{
&heap_hton,
&myisam_hton,
#ifdef WITH_INNOBASE_STORAGE_ENGINE
&innobase_hton,
#endif
#ifdef WITH_BERKELEY_STORAGE_ENGINE
&berkeley_hton,
#endif
#ifdef WITH_EXAMPLE_STORAGE_ENGINE
&example_hton,
#endif
#ifdef WITH_ARCHIVE_STORAGE_ENGINE
&archive_hton,
#endif
#ifdef WITH_CSV_STORAGE_ENGINE
&tina_hton,
#endif
#ifdef WITH_BLACKHOLE_STORAGE_ENGINE
&blackhole_hton,
#endif
#ifdef WITH_FEDERATED_STORAGE_ENGINE
&federated_hton,
#endif
#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
&ndbcluster_hton,
#endif
#ifdef WITH_PARTITION_STORAGE_ENGINE
&partition_hton,
#endif
&myisammrg_hton,
&binlog_hton,
NULL
};
sql/mysql_priv.h
View file @ 9c81773b
...@@ -784,9 +784,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ...@@ -784,9 +784,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
bool reset_auto_increment); bool reset_auto_increment);
bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok); bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok);
bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create); bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create);
uint create_table_def_key(THD *thd, byte *key, TABLE_LIST *table_list, uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
bool tmp_table); bool tmp_table);
TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key, TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
uint key_length, uint db_flags, int *error); uint key_length, uint db_flags, int *error);
void release_table_share(TABLE_SHARE *share, enum release_type type); void release_table_share(TABLE_SHARE *share, enum release_type type);
TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name); TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name);
...@@ -1396,7 +1396,7 @@ int format_number(uint inputflag,uint max_length,my_string pos,uint length, ...@@ -1396,7 +1396,7 @@ int format_number(uint inputflag,uint max_length,my_string pos,uint length,
my_string *errpos); my_string *errpos);
/* table.cc */ /* table.cc */
TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, byte *key, TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key,
uint key_length); uint key_length);
void init_tmp_table_share(TABLE_SHARE *share, const char *key, uint key_length, void init_tmp_table_share(TABLE_SHARE *share, const char *key, uint key_length,
const char *table_name, const char *path); const char *table_name, const char *path);
......
sql/mysqld.cc
View file @ 9c81773b
...@@ -356,8 +356,10 @@ extern ulong innobase_large_page_size; ...@@ -356,8 +356,10 @@ extern ulong innobase_large_page_size;
extern char *innobase_home, *innobase_tmpdir, *innobase_logdir; extern char *innobase_home, *innobase_tmpdir, *innobase_logdir;
extern long innobase_lock_scan_time; extern long innobase_lock_scan_time;
extern long innobase_mirrored_log_groups, innobase_log_files_in_group; extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
extern long innobase_log_file_size, innobase_log_buffer_size; extern longlong innobase_log_file_size;
extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size; extern long innobase_log_buffer_size;
extern longlong innobase_buffer_pool_size;
extern long innobase_additional_mem_pool_size;
extern long innobase_buffer_pool_awe_mem_mb; extern long innobase_buffer_pool_awe_mem_mb;
extern long innobase_file_io_threads, innobase_lock_wait_timeout; extern long innobase_file_io_threads, innobase_lock_wait_timeout;
extern long innobase_force_recovery; extern long innobase_force_recovery;
...@@ -7471,8 +7473,10 @@ char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir; ...@@ -7471,8 +7473,10 @@ char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir;
uint innobase_flush_log_at_trx_commit; uint innobase_flush_log_at_trx_commit;
ulong innobase_fast_shutdown; ulong innobase_fast_shutdown;
long innobase_mirrored_log_groups, innobase_log_files_in_group; long innobase_mirrored_log_groups, innobase_log_files_in_group;
long innobase_log_file_size, innobase_log_buffer_size; longlong innobase_log_file_size;
long innobase_buffer_pool_size, innobase_additional_mem_pool_size; long innobase_log_buffer_size;
longlong innobase_buffer_pool_size;
long innobase_additional_mem_pool_size;
long innobase_buffer_pool_awe_mem_mb; long innobase_buffer_pool_awe_mem_mb;
long innobase_file_io_threads, innobase_lock_wait_timeout; long innobase_file_io_threads, innobase_lock_wait_timeout;
long innobase_force_recovery; long innobase_force_recovery;
......
sql/set_var.cc
View file @ 9c81773b
...@@ -70,8 +70,10 @@ extern char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir; ...@@ -70,8 +70,10 @@ extern char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir;
extern uint innobase_flush_log_at_trx_commit; extern uint innobase_flush_log_at_trx_commit;
extern ulong innobase_fast_shutdown; extern ulong innobase_fast_shutdown;
extern long innobase_mirrored_log_groups, innobase_log_files_in_group; extern long innobase_mirrored_log_groups, innobase_log_files_in_group;
extern long innobase_log_file_size, innobase_log_buffer_size; extern longlong innobase_log_file_size;
extern long innobase_buffer_pool_size, innobase_additional_mem_pool_size; extern long innobase_log_buffer_size;
extern longlong innobase_buffer_pool_size;
extern long innobase_additional_mem_pool_size;
extern long innobase_buffer_pool_awe_mem_mb; extern long innobase_buffer_pool_awe_mem_mb;
extern long innobase_file_io_threads, innobase_lock_wait_timeout; extern long innobase_file_io_threads, innobase_lock_wait_timeout;
extern long innobase_force_recovery; extern long innobase_force_recovery;
......
sql/sql_base.cc
View file @ 9c81773b
...@@ -38,7 +38,7 @@ static bool table_def_inited= 0; ...@@ -38,7 +38,7 @@ static bool table_def_inited= 0;
static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list, static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list,
const char *alias, const char *alias,
byte *cache_key, uint cache_key_length, char *cache_key, uint cache_key_length,
MEM_ROOT *mem_root); MEM_ROOT *mem_root);
static void free_cache_entry(TABLE *entry); static void free_cache_entry(TABLE *entry);
static void mysql_rm_tmp_tables(void); static void mysql_rm_tmp_tables(void);
...@@ -171,7 +171,7 @@ static void check_unused(void) ...@@ -171,7 +171,7 @@ static void check_unused(void)
Length of key Length of key
*/ */
uint create_table_def_key(THD *thd, byte *key, TABLE_LIST *table_list, uint create_table_def_key(THD *thd, char *key, TABLE_LIST *table_list,
bool tmp_table) bool tmp_table)
{ {
uint key_length= (uint) (strmov(strmov(key, table_list->db)+1, uint key_length= (uint) (strmov(strmov(key, table_list->db)+1,
...@@ -273,7 +273,7 @@ uint cached_table_definitions(void) ...@@ -273,7 +273,7 @@ uint cached_table_definitions(void)
# Share for table # Share for table
*/ */
TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key, TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, char *key,
uint key_length, uint db_flags, int *error) uint key_length, uint db_flags, int *error)
{ {
TABLE_SHARE *share; TABLE_SHARE *share;
...@@ -339,7 +339,7 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key, ...@@ -339,7 +339,7 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key,
(void) pthread_mutex_lock(&share->mutex); (void) pthread_mutex_lock(&share->mutex);
#endif #endif
*error= share->error; *error= share->error;
(void) hash_delete(&table_def_cache, (char*) share); (void) hash_delete(&table_def_cache, (byte*) share);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
share->ref_count++; // Mark in use share->ref_count++; // Mark in use
...@@ -411,7 +411,7 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key, ...@@ -411,7 +411,7 @@ TABLE_SHARE *get_table_share(THD *thd, TABLE_LIST *table_list, byte *key,
static TABLE_SHARE static TABLE_SHARE
*get_table_share_with_create(THD *thd, TABLE_LIST *table_list, *get_table_share_with_create(THD *thd, TABLE_LIST *table_list,
byte *key, uint key_length, char *key, uint key_length,
uint db_flags, int *error) uint db_flags, int *error)
{ {
TABLE_SHARE *share; TABLE_SHARE *share;
...@@ -586,7 +586,7 @@ void release_table_share(TABLE_SHARE *share, enum release_type type) ...@@ -586,7 +586,7 @@ void release_table_share(TABLE_SHARE *share, enum release_type type)
TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name) TABLE_SHARE *get_cached_table_share(const char *db, const char *table_name)
{ {
byte key[NAME_LEN*2+2]; char key[NAME_LEN*2+2];
TABLE_LIST table_list; TABLE_LIST table_list;
uint key_length; uint key_length;
safe_mutex_assert_owner(&LOCK_open); safe_mutex_assert_owner(&LOCK_open);
...@@ -2366,7 +2366,7 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name) ...@@ -2366,7 +2366,7 @@ void abort_locked_tables(THD *thd,const char *db, const char *table_name)
static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list, static int open_unireg_entry(THD *thd, TABLE *entry, TABLE_LIST *table_list,
const char *alias, const char *alias,
byte *cache_key, uint cache_key_length, char *cache_key, uint cache_key_length,
MEM_ROOT *mem_root) MEM_ROOT *mem_root)
{ {
int error; int error;
......
sql/sql_partition.cc
View file @ 9c81773b
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "md5.h" #include "md5.h"
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
#include <ha_partition.h> #include "ha_partition.h"
/* /*
Partition related functions declarations and some static constants; Partition related functions declarations and some static constants;
*/ */
......
sql/sql_plugin.cc
View file @ 9c81773b
...@@ -208,14 +208,14 @@ static struct st_plugin_int *plugin_find_internal(LEX_STRING *name, int type) ...@@ -208,14 +208,14 @@ static struct st_plugin_int *plugin_find_internal(LEX_STRING *name, int type)
for (i= 0; i < MYSQL_MAX_PLUGIN_TYPE_NUM; i++) for (i= 0; i < MYSQL_MAX_PLUGIN_TYPE_NUM; i++)
{ {
struct st_plugin_int *plugin= (st_plugin_int *) struct st_plugin_int *plugin= (st_plugin_int *)
hash_search(&plugin_hash[i], name->str, name->length); hash_search(&plugin_hash[i], (const byte *)name->str, name->length);
if (plugin) if (plugin)
DBUG_RETURN(plugin); DBUG_RETURN(plugin);
} }
} }
else else
DBUG_RETURN((st_plugin_int *) DBUG_RETURN((st_plugin_int *)
hash_search(&plugin_hash[type], name->str, name->length)); hash_search(&plugin_hash[type], (const byte *)name->str, name->length));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
......
sql/table.cc
View file @ 9c81773b
...@@ -57,7 +57,7 @@ static byte *get_field_name(Field **buff, uint *length, ...@@ -57,7 +57,7 @@ static byte *get_field_name(Field **buff, uint *length,
# Share # Share
*/ */
TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, byte *key, TABLE_SHARE *alloc_table_share(TABLE_LIST *table_list, char *key,
uint key_length) uint key_length)
{ {
MEM_ROOT mem_root; MEM_ROOT mem_root;
...@@ -1268,7 +1268,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias, ...@@ -1268,7 +1268,7 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
outparam->field= field_ptr; outparam->field= field_ptr;
record= (char*) outparam->record[0]-1; /* Fieldstart = 1 */ record= (byte*) outparam->record[0]-1; /* Fieldstart = 1 */
if (share->null_field_first) if (share->null_field_first)
outparam->null_flags= (uchar*) record+1; outparam->null_flags= (uchar*) record+1;
else else
......
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