Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
aa7b2261
Commit
aa7b2261
authored
Mar 02, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
b4c59060
44c175b7
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
390 additions
and
83 deletions
+390
-83
VC++Files/mysql.sln
VC++Files/mysql.sln
+121
-83
VC++Files/sql/gen_lex_hash.dsp
VC++Files/sql/gen_lex_hash.dsp
+98
-0
VC++Files/sql/gen_lex_hash.vcproj
VC++Files/sql/gen_lex_hash.vcproj
+158
-0
mysql-test/r/skip_grants.result
mysql-test/r/skip_grants.result
+3
-0
mysql-test/t/skip_grants.test
mysql-test/t/skip_grants.test
+3
-0
sql/sql_udf.cc
sql/sql_udf.cc
+7
-0
No files found.
VC++Files/mysql.sln
View file @
aa7b2261
This diff is collapsed.
Click to expand it.
VC++Files/sql/gen_lex_hash.dsp
0 → 100644
View file @
aa7b2261
# Microsoft Developer Studio Project File - Name="gen_lex_hash" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=gen_lex_hash - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "gen_lex_hash.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "gen_lex_hash.mak" CFG="gen_lex_hash - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "gen_lex_hash - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "gen_lex_hash - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "gen_lex_hash - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "gen_lex_hash___Win32_Release"
# PROP BASE Intermediate_Dir "gen_lex_hash___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "gen_lex_hash___Win32_Release"
# PROP Intermediate_Dir "gen_lex_hash___Win32_Release"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x419 /d "NDEBUG"
# ADD RSC /l 0x419 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 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
!ELSEIF "$(CFG)" == "gen_lex_hash - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x419 /d "_DEBUG"
# ADD RSC /l 0x419 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib 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 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
!ENDIF
# Begin Target
# Name "gen_lex_hash - Win32 Release"
# Name "gen_lex_hash - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
VC++Files/sql/gen_lex_hash.vcproj
0 → 100644
View file @
aa7b2261
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType=
"Visual C++"
Version=
"7.10"
Name=
"gen_lex_hash"
ProjectGUID=
"{D593B5D1-8EFC-44FE-9937-A5AAD1E619A1}"
SccProjectName=
""
SccLocalPath=
""
>
<Platforms>
<Platform
Name=
"Win32"
/>
</Platforms>
<Configurations>
<Configuration
Name=
"Debug|Win32"
OutputDirectory=
".\Debug"
IntermediateDirectory=
".\Debug"
ConfigurationType=
"1"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"0"
AdditionalIncludeDirectories=
"../include"
PreprocessorDefinitions=
"WIN32;_DEBUG;_CONSOLE"
BasicRuntimeChecks=
"3"
RuntimeLibrary=
"1"
UsePrecompiledHeader=
"2"
PrecompiledHeaderFile=
".\Debug/gen_lex_hash.pch"
AssemblerListingLocation=
".\Debug/"
ObjectFile=
".\Debug/"
ProgramDataBaseFileName=
".\Debug/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
DebugInformationFormat=
"4"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLinkerTool"
AdditionalDependencies=
"Ws2_32.lib"
OutputFile=
"../sql/gen_lex_hash.exe"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
AdditionalLibraryDirectories=
"../lib_release"
GenerateDebugInformation=
"TRUE"
ProgramDatabaseFile=
".\Debug/gen_lex_hash.pdb"
SubSystem=
"1"
TargetMachine=
"1"
/>
<Tool
Name=
"VCMIDLTool"
TypeLibraryName=
".\Debug/gen_lex_hash.tlb"
HeaderFileName=
""
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
PreprocessorDefinitions=
"_DEBUG"
Culture=
"1049"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCWebDeploymentTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
<Configuration
Name=
"Release|Win32"
OutputDirectory=
".\gen_lex_hash___Win32_Release"
IntermediateDirectory=
".\gen_lex_hash___Win32_Release"
ConfigurationType=
"1"
UseOfMFC=
"0"
ATLMinimizesCRunTimeLibraryUsage=
"FALSE"
CharacterSet=
"2"
>
<Tool
Name=
"VCCLCompilerTool"
Optimization=
"2"
InlineFunctionExpansion=
"1"
AdditionalIncludeDirectories=
"../include"
PreprocessorDefinitions=
"WIN32;NDEBUG;_CONSOLE"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
UsePrecompiledHeader=
"2"
PrecompiledHeaderFile=
".\gen_lex_hash___Win32_Release/gen_lex_hash.pch"
AssemblerListingLocation=
".\gen_lex_hash___Win32_Release/"
ObjectFile=
".\gen_lex_hash___Win32_Release/"
ProgramDataBaseFileName=
".\gen_lex_hash___Win32_Release/"
WarningLevel=
"3"
SuppressStartupBanner=
"TRUE"
/>
<Tool
Name=
"VCCustomBuildTool"
/>
<Tool
Name=
"VCLinkerTool"
AdditionalDependencies=
"Ws2_32.lib"
OutputFile=
"../sql/gen_lex_hash.exe"
LinkIncremental=
"1"
SuppressStartupBanner=
"TRUE"
AdditionalLibraryDirectories=
"../lib_release"
ProgramDatabaseFile=
".\gen_lex_hash___Win32_Release/gen_lex_hash.pdb"
SubSystem=
"1"
TargetMachine=
"1"
/>
<Tool
Name=
"VCMIDLTool"
TypeLibraryName=
".\gen_lex_hash___Win32_Release/gen_lex_hash.tlb"
HeaderFileName=
""
/>
<Tool
Name=
"VCPostBuildEventTool"
/>
<Tool
Name=
"VCPreBuildEventTool"
/>
<Tool
Name=
"VCPreLinkEventTool"
/>
<Tool
Name=
"VCResourceCompilerTool"
PreprocessorDefinitions=
"NDEBUG"
Culture=
"1049"
/>
<Tool
Name=
"VCWebServiceProxyGeneratorTool"
/>
<Tool
Name=
"VCXMLDataGeneratorTool"
/>
<Tool
Name=
"VCWebDeploymentTool"
/>
<Tool
Name=
"VCManagedWrapperGeneratorTool"
/>
<Tool
Name=
"VCAuxiliaryManagedWrapperGeneratorTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name=
"Source Files"
Filter=
"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath=
".\gen_lex_hash.cpp"
>
</File>
</Filter>
<Filter
Name=
"Header Files"
Filter=
"h;hpp;hxx;hm;inl"
>
</Filter>
<Filter
Name=
"Resource Files"
Filter=
"ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
mysql-test/r/skip_grants.result
View file @
aa7b2261
...
...
@@ -12,3 +12,6 @@ create table t1 (a int);
create definer='user'@'host' sql security definer view v1 as select * from t1;
drop view v1;
drop table t1;
drop function if exists f1;
Warnings:
Note 1305 FUNCTION f1 does not exist
mysql-test/t/skip_grants.test
View file @
aa7b2261
...
...
@@ -30,3 +30,6 @@ create table t1 (a int);
create
definer
=
'user'
@
'host'
sql
security
definer
view
v1
as
select
*
from
t1
;
drop
view
v1
;
drop
table
t1
;
# BUG#17595: DROP FUNCTION IF EXISTS f1 crashes server
drop
function
if
exists
f1
;
sql/sql_udf.cc
View file @
aa7b2261
...
...
@@ -308,6 +308,10 @@ static void del_udf(udf_func *udf)
void
free_udf
(
udf_func
*
udf
)
{
DBUG_ENTER
(
"free_udf"
);
if
(
!
initialized
)
DBUG_VOID_RETURN
;
rw_wrlock
(
&
THR_LOCK_udf
);
if
(
!--
udf
->
usage_count
)
{
...
...
@@ -332,6 +336,9 @@ udf_func *find_udf(const char *name,uint length,bool mark_used)
udf_func
*
udf
=
0
;
DBUG_ENTER
(
"find_udf"
);
if
(
!
initialized
)
DBUG_RETURN
(
NULL
);
/* TODO: This should be changed to reader locks someday! */
if
(
mark_used
)
rw_wrlock
(
&
THR_LOCK_udf
);
/* Called during fix_fields */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment