Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2013-07-14 00:28:46
|
Revision: 58346
http://sourceforge.net/p/firebird/code/58346
Author: firebirds
Date: 2013-07-14 00:28:43 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-13 20:50:58 UTC (rev 58345)
+++ firebird/trunk/ChangeLog 2013-07-14 00:28:43 UTC (rev 58346)
@@ -1,3 +1,11 @@
+ 2013-07-13 20:50 asfernandes
+ M src/dsql/ExprNodes.cpp
+Fixed problem with COALESCE and IIF seen by Dmitry. Reintroduce the implicit casts removed in v3.
+
+ 2013-07-13 20:50 asfernandes
+ M src/include/gen/msgs.h
+Update generated file.
+
2013-07-11 06:00 dimitr
M src/dsql/StmtNodes.cpp
Fixed assertion/crash appeared in test bugs.core_1910.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-13 20:50:58 UTC (rev 58345)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-14 00:28:43 UTC (rev 58346)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30521
+ FORMAL BUILD NUMBER:30523
*/
-#define PRODUCT_VER_STRING "3.0.0.30521"
-#define FILE_VER_STRING "WI-T3.0.0.30521"
-#define LICENSE_VER_STRING "WI-T3.0.0.30521"
-#define FILE_VER_NUMBER 3, 0, 0, 30521
+#define PRODUCT_VER_STRING "3.0.0.30523"
+#define FILE_VER_STRING "WI-T3.0.0.30523"
+#define LICENSE_VER_STRING "WI-T3.0.0.30523"
+#define FILE_VER_NUMBER 3, 0, 0, 30523
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30521"
+#define FB_BUILD_NO "30523"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-13 20:50:58 UTC (rev 58345)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-14 00:28:43 UTC (rev 58346)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30521
+BuildNum=30523
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-16 00:44:46
|
Revision: 58356
http://sourceforge.net/p/firebird/code/58356
Author: firebirds
Date: 2013-07-16 00:44:41 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-15 16:51:51 UTC (rev 58355)
+++ firebird/trunk/ChangeLog 2013-07-16 00:44:41 UTC (rev 58356)
@@ -1,3 +1,30 @@
+ 2013-07-15 16:51 dimitr
+ M src/jrd/opt.cpp
+Removed incorrect assertion.
+
+ 2013-07-15 13:51 dimitr
+ M src/jrd/lck.cpp
+Fixed the sweep lock owner. This is a complementary bugfix for CORE-4134 (Race condition when auto-sweep is started).
+
+ 2013-07-15 13:44 dimitr
+ M src/jrd/vio.cpp
+A quick fix for the bugcheck appeared in test bugs.core_195.
+
+ 2013-07-15 13:06 alexpeshkoff
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecureRemotePassword/srp.cpp
+ M src/auth/SecureRemotePassword/srp.h
+Enhanced diagnostics in authentication plugin
+
+ 2013-07-15 12:24 alexpeshkoff
+ M src/jrd/svc.cpp
+Fixed error "All services except for getting server log require switches"
+
+ 2013-07-15 11:56 dimitr
+ M src/jrd/recsrc/SingularStream.cpp
+Fixed crash appeared in test bugs.core_2291.
+
2013-07-13 20:50 asfernandes
M src/dsql/ExprNodes.cpp
Fixed problem with COALESCE and IIF seen by Dmitry. Reintroduce the implicit casts removed in v3.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-15 16:51:51 UTC (rev 58355)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-16 00:44:41 UTC (rev 58356)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30523
+ FORMAL BUILD NUMBER:30529
*/
-#define PRODUCT_VER_STRING "3.0.0.30523"
-#define FILE_VER_STRING "WI-T3.0.0.30523"
-#define LICENSE_VER_STRING "WI-T3.0.0.30523"
-#define FILE_VER_NUMBER 3, 0, 0, 30523
+#define PRODUCT_VER_STRING "3.0.0.30529"
+#define FILE_VER_STRING "WI-T3.0.0.30529"
+#define LICENSE_VER_STRING "WI-T3.0.0.30529"
+#define FILE_VER_NUMBER 3, 0, 0, 30529
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30523"
+#define FB_BUILD_NO "30529"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-15 16:51:51 UTC (rev 58355)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-16 00:44:41 UTC (rev 58356)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30523
+BuildNum=30529
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-07-17 12:02:48
|
Revision: 58374
http://sourceforge.net/p/firebird/code/58374
Author: alexpeshkoff
Date: 2013-07-17 12:02:44 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Fixed posix install and management scripts
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
firebird/trunk/builds/install/arch-specific/linux/misc/postinstall.sh.in
firebird/trunk/builds/install/arch-specific/linux/misc/preuninstall.sh.in
firebird/trunk/builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
firebird/trunk/builds/install/misc/changeRunUser.sh.in
firebird/trunk/builds/install/misc/posixLibrary.sh.in
firebird/trunk/builds/install/misc/restoreRootRunUser.sh.in
firebird/trunk/builds/posix/postfix.darwin
firebird/trunk/configure.ac
Added Paths:
-----------
firebird/trunk/builds/install/misc/changeServerMode.sh.in
Removed Paths:
-------------
firebird/trunk/builds/install/misc/changeMultiConnectMode.sh.in
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -32,7 +32,7 @@
#------------------------------------------------------------------------
# Get correct options & misc.
-psOptions=aww
+psOptions=-efaww
export psOptions
mktOptions=-q
export mktOptions
@@ -153,7 +153,7 @@
# stop super server if it is running
stopSuperServerIfRunning() {
- checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server|firebird)\b" |grep -v grep`
+ checkString=`grepProcess "fbserver|fbguard|fb_smp_server|firebird"`
if [ ! -z "$checkString" ]
then
@@ -166,7 +166,7 @@
do
$init_d stop
sleep 1
- checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server|firebird)\b" |grep -v grep`
+ checkString=`grepProcess "fbserver|fbguard|fb_smp_server|firebird"`
if [ -z "$checkString" ]
then
return
@@ -238,11 +238,6 @@
# initd script for SuSE >= 7.2 is a part of RPM package
installInitdScript() {
- Arch=$1
- if [ "$Arch" != super ]; then
- return 0
- fi
-
srcScript=""
initScript=
@@ -364,24 +359,18 @@
# start init.d service
startService() {
- Arch=$1
- if [ "$Arch" != super ]; then
- return 0
- fi
-
InitFile=`getInitScriptLocation`
- if [ -f "$InitFile" ]
- then
+ if [ -f "$InitFile" ]; then
"$InitFile" start
- checkString=`ps -eaf | egrep "\b(firebird)\b" |grep -v grep`
+ checkString=`grepProcess "firebird"`
if [ -z "$checkString" ]
then
# server didn't start - wait a bit and recheck
sleep 2
"$InitFile" start
- checkString=`ps -eaf | egrep "\b(firebird)\b" |grep -v grep`
+ checkString=`grepProcess "firebird"`
if [ -z "$checkString" ]
then
echo "Looks like standalone server failed to start"
@@ -391,12 +380,12 @@
fi
}
+
#------------------------------------------------------------------------
# If we have right systems remove the service autostart stuff.
removeServiceAutostart() {
- InitFile=`getInitScriptLocation`
- if [ -f "$InitFile" ]; then
+ if standaloneServerInstalled; then
# Unregister using OS command
if [ -x /sbin/insserv ]; then
@@ -422,10 +411,11 @@
fi
}
+
#------------------------------------------------------------------------
# Returns TRUE if SA server is installed
-isStandaloneServerInstalled() {
+standaloneServerInstalled() {
InitFile=`getInitScriptLocation`
if [ -f "$InitFile" ]; then
return 0
@@ -433,6 +423,7 @@
return 1
}
+
#------------------------------------------------------------------------
# Corrects build-time "libdir" value
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -169,7 +169,7 @@
addLibs $BuiltFBDir/bin changeRunUser.sh ${TargetDir}@FB_SBINDIR@
addLibs $BuiltFBDir/bin restoreRootRunUser.sh ${TargetDir}@FB_SBINDIR@
addLibs $BuiltFBDir/bin changeDBAPassword.sh ${TargetDir}@FB_SBINDIR@
- addLibs $BuiltFBDir/bin changeMultiConnectMode.sh ${TargetDir}@FB_SBINDIR@
+ addLibs $BuiltFBDir/bin changeServerMode.sh ${TargetDir}@FB_SBINDIR@
cp $BuiltFBDir/bin/createAliasDB.sh ${TargetDir}@FB_SBINDIR@
cp $BuiltFBDir/bin/fb_config ${TargetDir}@FB_SBINDIR@
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/postinstall.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/postinstall.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/postinstall.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -40,7 +40,7 @@
addFirebirdUser
fi
-# Update ownership and SUID bits for files.
+# Update ownership for files.
fixFilePermissions
# Install script in /etc/init.d (exact location is distro dependent)
@@ -55,14 +55,14 @@
# Create libgds.so links
createLinksForBackCompatibility
-# Update the /etc/inetd.conf or xinetd entry
-updateInetdServiceEntry
+#Update the /etc/inetd.conf or xinetd entry
+#updateInetdServiceEntry
# Add sysdba and set password (use embedded access)
setDBAPassword
# Get inetd to reread new init files.
-resetInetdServer
+#resetInetdServer
# start the RDBMS server
startService
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/preuninstall.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/preuninstall.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/preuninstall.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -38,5 +38,3 @@
rm -f $i
fi
done
-
-rm -f @FB_SBINDIR@/fbmgr
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -55,7 +55,7 @@
if [ -e $scriptsDir ]
then
- displayMessage "Extracting install data"
+ displayMessage "Extracting uninstall data"
runAndCheckExit "$scriptsDir/preuninstall.sh"
runAndCheckExit "$scriptsDir/postuninstall.sh"
Deleted: firebird/trunk/builds/install/misc/changeMultiConnectMode.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/changeMultiConnectMode.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/misc/changeMultiConnectMode.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# The contents of this file are subject to the Initial
-# Developer's Public License Version 1.0 (the "License");
-# you may not use this file except in compliance with the
-# License. You may obtain a copy of the License at
-# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
-#
-# Software distributed under the License is distributed AS IS,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied.
-# See the License for the specific language governing rights
-# and limitations under the License.
-#
-# The Original Code was created by Alex Peshkoff
-# for the Firebird Open Source RDBMS project.
-#
-# Copyright (c) 2008 Alex Peshkoff <pes...@ma...>
-# and all contributors signed below.
-#
-# All Rights Reserved.
-# Contributor(s): ______________________________________.
-#
-
-#= Main ====================================================================
-
-cat <<EOF
-For classic server there are two ways to support multiple connections:
-multiprocess (traditional for FB classic server) and multithread (new for FB 2.5).
-
-multiprocess mode is specially reliable cause error in one process does not affect others.
-multithread minimizes OS load and should provide better scalability under high loads.
-
-EOF
-
-AskQuestion "Which option would you like to choose: multi-(process|thread) [process] " "process"
-multiAnswer=$Answer
-
-case $multiAnswer in
-process)
- ;;
-thread)
- ;;
-*)
- echo "Unknown option $multiAnswer chosen"
- exit 1
- ;;
-esac
-
-echo "Stopping currently running engine..."
-checkIfServerRunning
-removeInetdServiceEntry
-removeServiceAutostart
-
-echo "Starting firebird in multi$multiAnswer mode..."
-if [ $multiAnswer == process ]; then
- updateInetdServiceEntry
- resetInetdServer
-else
- installInitdScript super
- startService super
-fi
-
-echo "Done."
Modified: firebird/trunk/builds/install/misc/changeRunUser.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/changeRunUser.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/misc/changeRunUser.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -26,7 +26,6 @@
RunUser=firebird
RunGroup=firebird
-serverMode=classic
checkInstallUser
checkIfServerRunning
@@ -51,12 +50,11 @@
updateInetdServiceEntry
changeInitRunUser $RunUser
-# Update ownership and SUID bits for programs.
+# Update ownership and SUID bits for programs
echo "Updating permissions"
fixFilePermissions
-# Get inetd to reread new init files, start service.
-resetInetdServer
-startService $serverMode
+# Start server again
+startFirebird
echo "Completed."
Copied: firebird/trunk/builds/install/misc/changeServerMode.sh.in (from rev 58348, firebird/trunk/builds/install/misc/changeMultiConnectMode.sh.in)
===================================================================
--- firebird/trunk/builds/install/misc/changeServerMode.sh.in (rev 0)
+++ firebird/trunk/builds/install/misc/changeServerMode.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Initial
+# Developer's Public License Version 1.0 (the "License");
+# you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl.
+#
+# Software distributed under the License is distributed AS IS,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied.
+# See the License for the specific language governing rights
+# and limitations under the License.
+#
+# The Original Code was created by Alex Peshkoff
+# for the Firebird Open Source RDBMS project.
+#
+# Copyright (c) 2008 Alex Peshkoff <pes...@ma...>
+# and all contributors signed below.
+#
+# All Rights Reserved.
+# Contributor(s): ______________________________________.
+#
+
+#= Main ====================================================================
+
+cat <<EOF
+Firebird server may run in 2 different modes - super and classic.
+Super server provides better performance, classic - better availability.
+
+*** Warning: runuser will be reset to firebird.
+
+EOF
+
+AskQuestion "Which option would you like to choose: (super|classic) [super] " "super"
+multiAnswer=$Answer
+
+case "$multiAnswer" in
+super)
+ ;;
+classic)
+ ;;
+*)
+ echo "Unknown option $multiAnswer chosen"
+ exit 1
+ ;;
+esac
+
+echo "Stopping currently running engine..."
+checkIfServerRunning
+removeInetdServiceEntry
+removeServiceAutostart
+
+echo "Starting firebird in $multiAnswer server mode..."
+fbconf="@FB_CONFDIR@/firebird.conf"
+if [ $multiAnswer == classic ]; then
+ replaceLineInFile $fbconf "SharedCache = false" "^SharedCache"
+ replaceLineInFile $fbconf "SharedDatabase = true" "^SharedDatabase"
+
+ updateInetdServiceEntry
+ resetInetdServer
+else
+ replaceLineInFile $fbconf "SharedCache = true" "^SharedCache"
+ replaceLineInFile $fbconf "SharedDatabase = false" "^SharedDatabase"
+
+ installInitdScript
+ startService
+fi
+
+echo "Done."
Property changes on: firebird/trunk/builds/install/misc/changeServerMode.sh.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/builds/install/misc/posixLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/posixLibrary.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/misc/posixLibrary.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -150,7 +150,7 @@
# Works for both inetd and xinetd
resetInetdServer() {
- pid=`ps -eaf$psOptions | grep inetd | grep -v grep | awk '{print $2}'`
+ pid=`grepProcess "inetd|xinetd" | awk '{print $2}'`
if [ "$pid" ]
then
kill -HUP $pid
@@ -200,17 +200,20 @@
#------------------------------------------------------------------------
+# grep process by name
+
+grepProcess() {
+ processList=$1
+ eol=\$
+ ps $psOptions | egrep "\<($processList)($eol|[[:space:]])" | grep -v grep
+}
+
+
+#------------------------------------------------------------------------
# check if it is running
checkIfServerRunning() {
- checkString=`ps -ef$psOptions | egrep "[[:space:]]\b(fbserver|fbguard|fb_smp_server|firebird)\b[[:space:]]" |grep -v grep`
- if [ ! -z "$checkString" ]
- then
- serverMode=super
- fi
-
-# have to be root to stop the server
if [ "$1" != "install-embedded" ]
then
stopSuperServerIfRunning
@@ -219,7 +222,7 @@
# Check is server is being actively used.
- checkString=`ps -ef$psOptions | egrep "[[:space:]]\b(firebird)\b[[:space:]]" |grep -v grep`
+ checkString=`grepProcess "firebird"`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird server seems to be running."
@@ -227,7 +230,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "[[:space:]]\b(fb_smp_server)\b[[:space:]]" |grep -v grep`
+ checkString=`grepProcess "fb_smp_server"`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird SuperClassic server seems to be running."
@@ -235,7 +238,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "[[:space:]]\b(fbserver|fbguard)\b[[:space:]]" |grep -v grep`
+ checkString=`grepProcess "fbserver|fbguard"`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird Super server seems to be running."
@@ -243,7 +246,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "[[:space:]]\b(fb_inet_server|gds_pipe)\b[[:space:]]" |grep -v grep`
+ checkString=`grepProcess "fb_inet_server|gds_pipe"`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird Classic server seems to be running."
@@ -254,7 +257,7 @@
# The following check for running interbase or firebird 1.0 servers.
- checkString=`ps -ef$psOptions | egrep "\b(ibserver|ibguard)\b" |grep -v grep`
+ checkString=`grepProcess "ibserver|ibguard"`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Super server seems to be running."
@@ -263,7 +266,7 @@
exit 1
fi
- checkString=`ps -ef$psOptions | egrep "\b(gds_inet_server|gds_pipe)\b" |grep -v grep`
+ checkString=`grepProcess "gds_inet_server|gds_pipe"`
if [ ! -z "$checkString" ]
then
echo "An instance of the Firebird/InterBase Classic server seems to be running."
@@ -342,7 +345,7 @@
# Here there are three cases, not found => add
# found & different => replace
# found & same => do nothing
-#
+#
replaceLineInFile() {
FileName="$1"
@@ -416,7 +419,7 @@
else
echo "# generated on `hostname` at time `date`" >> $DBAPasswordFile
fi
-
+
cat <<EOT >>$DBAPasswordFile
# Your password can be changed to a more suitable one using the
@@ -435,19 +438,7 @@
fi
}
-#------------------------------------------------------------------------
-# Change sysdba password.
-changeDBAPassword() {
- if [ -z "$InteractiveInstall" ]
- then
- generateNewDBAPassword
- else
- askUserForNewDBAPassword masterkey
- fi
-}
-
-
#------------------------------------------------------------------------
# Set sysdba password.
@@ -461,7 +452,7 @@
passwd=$NewPasswd
fi
- if [ ! -z "$passwd" ]
+ if [ -z "$passwd" ]
then
passwd=masterkey
fi
@@ -885,7 +876,7 @@
# Install differs for each of them.
updateInetdServiceEntry() {
- if ! isStandaloneServerInstalled
+ if ! standaloneServerInstalled
then
if [ -d /etc/xinetd.d ]
then
@@ -923,3 +914,15 @@
export InteractiveInstall
fi
}
+
+
+#---------------------------------------------------------------------------
+# depending upon presence of startup script starts super or classic server
+
+startFirebird() {
+ if standaloneServerInstalled; then
+ startService
+ else
+ resetInetdServer
+ fi
+}
Modified: firebird/trunk/builds/install/misc/restoreRootRunUser.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/restoreRootRunUser.sh.in 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/install/misc/restoreRootRunUser.sh.in 2013-07-17 12:02:44 UTC (rev 58374)
@@ -26,7 +26,6 @@
RunUser=root
RunGroup=root
-serverMode=classic
checkInstallUser
checkIfServerRunning
@@ -51,12 +50,11 @@
updateInetdServiceEntry
changeInitRunUser $RunUser
-# Update ownership and SUID bits for programs.
+# Update ownership and SUID bits for programs
echo "Updating permissions"
fixFilePermissions
-# Get inetd to reread new init files, start service.
-resetInetdServer
-startService $serverMode
+# Start server again
+startFirebird
echo "Completed."
Modified: firebird/trunk/builds/posix/postfix.darwin
===================================================================
--- firebird/trunk/builds/posix/postfix.darwin 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/builds/posix/postfix.darwin 2013-07-17 12:02:44 UTC (rev 58374)
@@ -93,9 +93,9 @@
cp ../gen/firebird/bin/fbtracemgr $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fbguard $(FB_FW)/Resources/bin
cp ../gen/firebird/bin/fb_smp_server $(FB_FW)/Resources/bin
- chmod +x ../builds/install/arch-specific/darwin/changeMultiConnectMode
- cp ../builds/install/arch-specific/darwin/changeMultiConnectMode \
- $(FB_FW)/Resources/bin/changeMultiConnectMode.sh
+ chmod +x ../builds/install/arch-specific/darwin/changeServerMode
+ cp ../builds/install/arch-specific/darwin/changeServerMode \
+ $(FB_FW)/Resources/bin/changeServerMode.sh
cp ../src/extlib/ib_udf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../src/extlib/fbudf/fbudf.sql $(FB_FW)/Resources/English.lproj/var/UDF
cp ../builds/install/arch-specific/darwin/FrameworkInfo.plist \
Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac 2013-07-17 11:55:04 UTC (rev 58373)
+++ firebird/trunk/configure.ac 2013-07-17 12:02:44 UTC (rev 58374)
@@ -1139,7 +1139,7 @@
gen/Release/firebird/bin/taruninstall.sh:builds/install/arch-specific/linux/misc/taruninstall.sh.in
gen/Release/firebird/bin/tarMainUninstall.sh:builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
gen/Release/firebird/bin/changeDBAPassword.sh:builds/install/misc/changeDBAPassword.sh.in
-gen/Release/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in
+gen/Release/firebird/bin/changeServerMode.sh:builds/install/misc/changeServerMode.sh.in
gen/Release/firebird/bin/createAliasDB.sh:builds/install/misc/createAliasDB.sh.in
gen/vers.sh:builds/posix/vers.sh.in
])
@@ -1202,7 +1202,7 @@
gen/install/misc/firebird.init.d.aix:builds/install/arch-specific/aix/misc/firebird.init.d.aix.in
gen/install/misc/rc.config.firebird.aix:builds/install/arch-specific/aix/misc/rc.config.firebird.aix.in
gen/firebird/bin/changedbapassword.aix.sh:builds/install/misc/changeDBAPassword.sh.in
- gen/firebird/bin/changemulticonnectmode.aix.sh:builds/install/misc/changeMultiConnectMode.sh.in
+ gen/firebird/bin/changemulticonnectmode.aix.sh:builds/install/misc/changeServerMode.sh.in
gen/firebird/bin/changegdslibrarycompatiblelink.aix.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
gen/firebird/bin/createaliasdb.aix.sh:builds/install/misc/createAliasDB.sh.in
gen/firebird/bin/aixLibrary.sh:builds/install/arch-specific/aix/misc/aixLibrary.sh.in],
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-07-17 13:05:43
|
Revision: 58376
http://sourceforge.net/p/firebird/code/58376
Author: alexpeshkoff
Date: 2013-07-17 13:05:39 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Bring set of examples in posix builds up to date
Modified Paths:
--------------
firebird/trunk/builds/posix/Makefile.in.examples
firebird/trunk/configure.ac
Modified: firebird/trunk/builds/posix/Makefile.in.examples
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.examples 2013-07-17 12:50:16 UTC (rev 58375)
+++ firebird/trunk/builds/posix/Makefile.in.examples 2013-07-17 13:05:39 UTC (rev 58376)
@@ -97,12 +97,13 @@
$(CP) $(ROOT)/examples/readme $(FIREBIRD)/examples/README
$(CP) $(ROOT)/examples/*.* $(FIREBIRD)/examples/
$(CP) $(ROOT)/examples/api/*.* $(FIREBIRD)/examples/api/
-# $(CP) $(ROOT)/examples/build_unix/*.* $(FIREBIRD)/examples/build_unix/
-# $(CP) $(ROOT)/examples/build_win32/*.* $(FIREBIRD)/examples/build_win32/
- $(CP) $(ROOT)/examples/dyn/*.* $(FIREBIRD)/examples/dyn/
+ $(CP) $(ROOT)/examples/dbcrypt/*.* $(FIREBIRD)/examples/dbcrypt/
$(CP) $(ROOT)/examples/include/*.* $(FIREBIRD)/examples/include/
+ $(CP) $(ROOT)/examples/interfaces/*.* $(FIREBIRD)/examples/interfaces/
+ $(CP) $(ROOT)/examples/package/*.* $(FIREBIRD)/examples/package/
$(CP) $(ROOT)/examples/stat/*.* $(FIREBIRD)/examples/stat/
$(CP) $(ROOT)/examples/udf/*.* $(FIREBIRD)/examples/udf/
+ $(CP) $(ROOT)/examples/udr/*.* $(FIREBIRD)/examples/udr/
# $(CP) intlemp.fdb $(FIREBIRD)/examples/empbuild/
$(EXAMPLES_DEST)% : $(EXAMPLES_SRC)%
Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac 2013-07-17 12:50:16 UTC (rev 58375)
+++ firebird/trunk/configure.ac 2013-07-17 13:05:39 UTC (rev 58376)
@@ -1071,14 +1071,14 @@
mkdir -p gen/\$fb_tgt/firebird/bin
mkdir -p gen/\$fb_tgt/firebird/plugins
mkdir -p gen/\$fb_tgt/firebird/examples/api
- mkdir -p gen/\$fb_tgt/firebird/examples/dyn
- dnl # mkdir -p gen/\$fb_tgt/firebird/examples/build_unix
- dnl # mkdir -p gen/\$fb_tgt/firebird/examples/build_win32
+ mkdir -p gen/\$fb_tgt/firebird/examples/dbcrypt
mkdir -p gen/\$fb_tgt/firebird/examples/empbuild
mkdir -p gen/\$fb_tgt/firebird/examples/include
- mkdir -p gen/\$fb_tgt/firebird/examples/udr
+ mkdir -p gen/\$fb_tgt/firebird/examples/interfaces
+ mkdir -p gen/\$fb_tgt/firebird/examples/package
mkdir -p gen/\$fb_tgt/firebird/examples/stat
mkdir -p gen/\$fb_tgt/firebird/examples/udf
+ mkdir -p gen/\$fb_tgt/firebird/examples/udr
mkdir -p gen/\$fb_tgt/firebird/lib
mkdir -p gen/\$fb_tgt/firebird/misc
mkdir -p gen/\$fb_tgt/firebird/help
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-19 00:26:04
|
Revision: 58381
http://sourceforge.net/p/firebird/code/58381
Author: firebirds
Date: 2013-07-19 00:26:00 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-18 16:21:30 UTC (rev 58380)
+++ firebird/trunk/ChangeLog 2013-07-19 00:26:00 UTC (rev 58381)
@@ -1,3 +1,94 @@
+ 2013-07-18 16:21 asfernandes
+ M src/jrd/SimilarToMatcher.h
+Fix old "simplification" that broke SIMILAR TO (bugs.core_0769 test case).
+
+ 2013-07-18 10:13 alexpeshkoff
+ M src/jrd/svc.cpp
+Avoid races when accessing svc_flags
+
+ 2013-07-18 10:08 alexpeshkoff
+ M src/common/utils.cpp
+Fixed a bug, related with isc_info_svc_running
+
+ 2013-07-17 13:05 alexpeshkoff
+ M builds/posix/Makefile.in.examples
+ M configure.ac
+Bring set of examples in posix builds up to date
+
+ 2013-07-17 12:50 alexpeshkoff
+ M builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+Put OO API include files into linux packages
+
+ 2013-07-17 12:02 alexpeshkoff
+ M builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
+ M builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+ M builds/install/arch-specific/linux/misc/postinstall.sh.in
+ M builds/install/arch-specific/linux/misc/preuninstall.sh.in
+ M builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in
+ D builds/install/misc/changeMultiConnectMode.sh.in
+ M builds/install/misc/changeRunUser.sh.in
+ A builds/install/misc/changeServerMode.sh.in (from /firebird/trunk/builds/install/misc/changeMultiConnectMode.sh.in:58348)
+ M builds/install/misc/posixLibrary.sh.in
+ M builds/install/misc/restoreRootRunUser.sh.in
+ M builds/posix/postfix.darwin
+ M configure.ac
+Fixed posix install and management scripts
+
+ 2013-07-17 11:55 alexpeshkoff
+ M builds/install/arch-specific/freebsd/freebsdLibrary.sh.in
+ M builds/install/arch-specific/freebsd/install.sh.in
+Front-ported changes from 2.5
+
+ 2013-07-17 11:43 paulbeach
+ A builds/install/arch-specific/darwin/embed.Info.plist
+Add support for embedded mode on MacOSX as an app bundle as well as the existing framework
+
+ 2013-07-17 11:18 paulbeach
+ M src/common/os/darwin/mod_loader.cpp
+Update mod_loader to use Posix dl functions rather than deprecated NS functions. Add support for embedded mode on MacOSX as an app bundle as well as the existing framework
+
+ 2013-07-17 11:13 paulbeach
+ M src/common/config/os/darwin/config_root.cpp
+Update mod_loader to use Posix dl functions rather than deprecated NS functions. Add support for embedded mode on MacOSX as an app bundle as well as the existing framework
+
+ 2013-07-17 10:25 paulbeach
+ A builds/install/arch-specific/darwin/embed.darwin
+Update mod_loader to use Posix dl functions rather than deprecated NS functions. Add support for embedded mode on MacOSX as an app bundle as well as the existing framework
+
+ 2013-07-16 16:18 asfernandes
+ M src/dsql/pass1.cpp
+Fixed reintrodution of CORE-2660 noted by Dmitry.
+
+ 2013-07-16 10:25 dimitr
+ M src/dsql/StmtNodes.cpp
+Fixed regression appeared in test functional.view.create_07.
+
+ 2013-07-16 08:32 dimitr
+ M src/common/StatusArg.cpp
+ M src/common/StatusArg.h
+ M src/jrd/fun.epp
+Fixed regression appeared in test bugs.core_2582.
+
+ 2013-07-16 07:04 dimitr
+ M src/jrd/par.cpp
+Fixed regression appeared in test bugs.core_2042. User PSQL routine requests should not be marked as internal.
+
+ 2013-07-16 06:22 dimitr
+ M src/jrd/recsrc/BufferedStream.cpp
+Misc adjustments.
+
+ 2013-07-16 05:07 dimitr
+ M src/jrd/RecordSourceNodes.cpp
+Fixed regression appeared in test bugs.core_0965.
+
+ 2013-07-16 05:05 dimitr
+ M src/dsql/StmtNodes.cpp
+Misc adjustments.
+
+ 2013-07-16 03:53 dimitr
+ M src/dsql/DdlNodes.epp
+Fixed regression appeared in test bugs.core_1715.
+
2013-07-15 16:51 dimitr
M src/jrd/opt.cpp
Removed incorrect assertion.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-18 16:21:30 UTC (rev 58380)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-19 00:26:00 UTC (rev 58381)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30529
+ FORMAL BUILD NUMBER:30548
*/
-#define PRODUCT_VER_STRING "3.0.0.30529"
-#define FILE_VER_STRING "WI-T3.0.0.30529"
-#define LICENSE_VER_STRING "WI-T3.0.0.30529"
-#define FILE_VER_NUMBER 3, 0, 0, 30529
+#define PRODUCT_VER_STRING "3.0.0.30548"
+#define FILE_VER_STRING "WI-T3.0.0.30548"
+#define LICENSE_VER_STRING "WI-T3.0.0.30548"
+#define FILE_VER_NUMBER 3, 0, 0, 30548
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30529"
+#define FB_BUILD_NO "30548"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-18 16:21:30 UTC (rev 58380)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-19 00:26:00 UTC (rev 58381)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30529
+BuildNum=30548
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-20 00:27:45
|
Revision: 58387
http://sourceforge.net/p/firebird/code/58387
Author: firebirds
Date: 2013-07-20 00:27:41 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-19 16:05:29 UTC (rev 58386)
+++ firebird/trunk/ChangeLog 2013-07-20 00:27:41 UTC (rev 58387)
@@ -1,3 +1,18 @@
+ 2013-07-19 13:51 alexpeshkoff
+ M src/common/MsgMetadata.cpp
+ M src/common/MsgMetadata.h
+ M src/common/StatementMetadata.h
+ M src/jrd/EngineInterface.h
+ M src/remote/client/interface.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/why.cpp
+Fixed segfault when releasing IMessageMetadata, reported by Dmitry privately. It was bad idea to return to the user interface created by plugin.
+
+ 2013-07-19 12:09 hvlad
+ M src/dsql/DsqlCompilerScratch.h
+ M src/dsql/pass1.cpp
+Fixed bug CORE-4005 : wrong error message with recursive CTE
+
2013-07-18 16:21 asfernandes
M src/jrd/SimilarToMatcher.h
Fix old "simplification" that broke SIMILAR TO (bugs.core_0769 test case).
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-19 16:05:29 UTC (rev 58386)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-20 00:27:41 UTC (rev 58387)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30548
+ FORMAL BUILD NUMBER:30550
*/
-#define PRODUCT_VER_STRING "3.0.0.30548"
-#define FILE_VER_STRING "WI-T3.0.0.30548"
-#define LICENSE_VER_STRING "WI-T3.0.0.30548"
-#define FILE_VER_NUMBER 3, 0, 0, 30548
+#define PRODUCT_VER_STRING "3.0.0.30550"
+#define FILE_VER_STRING "WI-T3.0.0.30550"
+#define LICENSE_VER_STRING "WI-T3.0.0.30550"
+#define FILE_VER_NUMBER 3, 0, 0, 30550
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30548"
+#define FB_BUILD_NO "30550"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-19 16:05:29 UTC (rev 58386)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-20 00:27:41 UTC (rev 58387)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30548
+BuildNum=30550
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-23 01:11:19
|
Revision: 58405
http://sourceforge.net/p/firebird/code/58405
Author: firebirds
Date: 2013-07-23 01:11:15 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-22 16:34:57 UTC (rev 58404)
+++ firebird/trunk/ChangeLog 2013-07-23 01:11:15 UTC (rev 58405)
@@ -1,3 +1,28 @@
+ 2013-07-22 16:03 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2013-07-22 15:44 dimitr
+ M doc/WhatsNew
+Updated the docs.
+
+ 2013-07-22 13:35 hvlad
+ M src/common/ThreadStart.cpp
+Avoid deadlock on Windows when DLL's is unloaded and fb_shutdown() was not called by application before FreeLibrary().
+This decision is investigated and could be reworked if necessary.
+
+ 2013-07-22 12:27 alexpeshkoff
+ M src/yvalve/why.cpp
+Make fb_shutdown() automatically invoked in any OS - to be checked by Vlad
+
+ 2013-07-22 09:11 alexpeshkoff
+ M src/jrd/fields.h
+Fixed bugs.core_1076: priorly user first/second/last names were limited to 32 chars, but now the limit is 31 chars. Restored length to 32.
+
+ 2013-07-22 08:29 hvlad
+ M src/jrd/RecordSourceNodes.cpp
+Fixed bug CORE-4144 : Error "context already in use (BLR error)" when preparing a query with UNION
+
2013-07-19 13:51 alexpeshkoff
M src/common/MsgMetadata.cpp
M src/common/MsgMetadata.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-22 16:34:57 UTC (rev 58404)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-23 01:11:15 UTC (rev 58405)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30550
+ FORMAL BUILD NUMBER:30556
*/
-#define PRODUCT_VER_STRING "3.0.0.30550"
-#define FILE_VER_STRING "WI-T3.0.0.30550"
-#define LICENSE_VER_STRING "WI-T3.0.0.30550"
-#define FILE_VER_NUMBER 3, 0, 0, 30550
+#define PRODUCT_VER_STRING "3.0.0.30556"
+#define FILE_VER_STRING "WI-T3.0.0.30556"
+#define LICENSE_VER_STRING "WI-T3.0.0.30556"
+#define FILE_VER_NUMBER 3, 0, 0, 30556
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30550"
+#define FB_BUILD_NO "30556"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-22 16:34:57 UTC (rev 58404)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-23 01:11:15 UTC (rev 58405)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30550
+BuildNum=30556
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-24 00:19:29
|
Revision: 58410
http://sourceforge.net/p/firebird/code/58410
Author: firebirds
Date: 2013-07-24 00:19:26 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-23 11:41:37 UTC (rev 58409)
+++ firebird/trunk/ChangeLog 2013-07-24 00:19:26 UTC (rev 58410)
@@ -1,3 +1,7 @@
+ 2013-07-23 11:41 alexpeshkoff
+ M src/dsql/DsqlCompilerScratch.h
+gcc warning - init order
+
2013-07-22 16:03 dimitr
M doc/WhatsNew
Updated the docs.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-23 11:41:37 UTC (rev 58409)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-24 00:19:26 UTC (rev 58410)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30556
+ FORMAL BUILD NUMBER:30557
*/
-#define PRODUCT_VER_STRING "3.0.0.30556"
-#define FILE_VER_STRING "WI-T3.0.0.30556"
-#define LICENSE_VER_STRING "WI-T3.0.0.30556"
-#define FILE_VER_NUMBER 3, 0, 0, 30556
+#define PRODUCT_VER_STRING "3.0.0.30557"
+#define FILE_VER_STRING "WI-T3.0.0.30557"
+#define LICENSE_VER_STRING "WI-T3.0.0.30557"
+#define FILE_VER_NUMBER 3, 0, 0, 30557
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30556"
+#define FB_BUILD_NO "30557"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-23 11:41:37 UTC (rev 58409)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-24 00:19:26 UTC (rev 58410)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30556
+BuildNum=30557
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-26 00:26:21
|
Revision: 58414
http://sourceforge.net/p/firebird/code/58414
Author: firebirds
Date: 2013-07-26 00:26:18 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-25 14:21:46 UTC (rev 58413)
+++ firebird/trunk/ChangeLog 2013-07-26 00:26:18 UTC (rev 58414)
@@ -1,3 +1,8 @@
+ 2013-07-25 14:21 hvlad
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+Fixed memory leak when fbclient library is unloaded manually
+
2013-07-23 11:41 alexpeshkoff
M src/dsql/DsqlCompilerScratch.h
gcc warning - init order
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-25 14:21:46 UTC (rev 58413)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-26 00:26:18 UTC (rev 58414)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30557
+ FORMAL BUILD NUMBER:30558
*/
-#define PRODUCT_VER_STRING "3.0.0.30557"
-#define FILE_VER_STRING "WI-T3.0.0.30557"
-#define LICENSE_VER_STRING "WI-T3.0.0.30557"
-#define FILE_VER_NUMBER 3, 0, 0, 30557
+#define PRODUCT_VER_STRING "3.0.0.30558"
+#define FILE_VER_STRING "WI-T3.0.0.30558"
+#define LICENSE_VER_STRING "WI-T3.0.0.30558"
+#define FILE_VER_NUMBER 3, 0, 0, 30558
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30557"
+#define FB_BUILD_NO "30558"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-25 14:21:46 UTC (rev 58413)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-26 00:26:18 UTC (rev 58414)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30557
+BuildNum=30558
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-27 00:24:26
|
Revision: 58416
http://sourceforge.net/p/firebird/code/58416
Author: firebirds
Date: 2013-07-27 00:24:23 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-26 08:49:47 UTC (rev 58415)
+++ firebird/trunk/ChangeLog 2013-07-27 00:24:23 UTC (rev 58416)
@@ -1,3 +1,7 @@
+ 2013-07-26 08:49 alexpeshkoff
+ M src/common/classes/Reasons.h
+Better debug info
+
2013-07-25 14:21 hvlad
M src/common/classes/alloc.cpp
M src/common/classes/alloc.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-26 08:49:47 UTC (rev 58415)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-27 00:24:23 UTC (rev 58416)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30558
+ FORMAL BUILD NUMBER:30559
*/
-#define PRODUCT_VER_STRING "3.0.0.30558"
-#define FILE_VER_STRING "WI-T3.0.0.30558"
-#define LICENSE_VER_STRING "WI-T3.0.0.30558"
-#define FILE_VER_NUMBER 3, 0, 0, 30558
+#define PRODUCT_VER_STRING "3.0.0.30559"
+#define FILE_VER_STRING "WI-T3.0.0.30559"
+#define LICENSE_VER_STRING "WI-T3.0.0.30559"
+#define FILE_VER_NUMBER 3, 0, 0, 30559
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30558"
+#define FB_BUILD_NO "30559"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-26 08:49:47 UTC (rev 58415)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-27 00:24:23 UTC (rev 58416)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30558
+BuildNum=30559
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-29 00:24:09
|
Revision: 58427
http://sourceforge.net/p/firebird/code/58427
Author: firebirds
Date: 2013-07-29 00:24:06 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-28 01:10:35 UTC (rev 58426)
+++ firebird/trunk/ChangeLog 2013-07-29 00:24:06 UTC (rev 58427)
@@ -1,3 +1,9 @@
+ 2013-07-28 01:10 asfernandes
+ M src/dsql/dsql.cpp
+ M src/isql/isql.epp
+ M src/jrd/constants.h
+Improvement CORE-4148 - Increase ISQL buffer size from 64 KB to 10 MB, as the engine.
+
2013-07-26 08:49 alexpeshkoff
M src/common/classes/Reasons.h
Better debug info
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-28 01:10:35 UTC (rev 58426)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-29 00:24:06 UTC (rev 58427)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30559
+ FORMAL BUILD NUMBER:30560
*/
-#define PRODUCT_VER_STRING "3.0.0.30559"
-#define FILE_VER_STRING "WI-T3.0.0.30559"
-#define LICENSE_VER_STRING "WI-T3.0.0.30559"
-#define FILE_VER_NUMBER 3, 0, 0, 30559
+#define PRODUCT_VER_STRING "3.0.0.30560"
+#define FILE_VER_STRING "WI-T3.0.0.30560"
+#define LICENSE_VER_STRING "WI-T3.0.0.30560"
+#define FILE_VER_NUMBER 3, 0, 0, 30560
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30559"
+#define FB_BUILD_NO "30560"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-28 01:10:35 UTC (rev 58426)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-29 00:24:06 UTC (rev 58427)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30559
+BuildNum=30560
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-07-31 00:30:54
|
Revision: 58437
http://sourceforge.net/p/firebird/code/58437
Author: firebirds
Date: 2013-07-31 00:30:50 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-30 07:51:28 UTC (rev 58436)
+++ firebird/trunk/ChangeLog 2013-07-31 00:30:50 UTC (rev 58437)
@@ -1,3 +1,35 @@
+ 2013-07-30 06:56 paul_reeves
+ M builds/install/arch-specific/win32/BuildExecutableInstall.bat
+ M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+Sync misc changes related to the windows installer for Alpha 1 to trunk
+
+ 2013-07-29 13:00 alexpeshkoff
+ M src/common/IntlUtil.cpp
+ M src/common/unicode_util.cpp
+ M src/common/unicode_util.h
+ M src/utilities/ntrace/TraceUnicodeUtils.cpp
+Make firebird use as default ICU present on the host
+
+ 2013-07-29 08:17 dimitr
+ M src/isql/extract.epp
+ M src/isql/show.epp
+Fixed CORE-4149: New permission types are not displayed by ISQL.
+
+ 2013-07-29 07:23 alexpeshkoff
+ M builds/install/arch-specific/linux/misc/firebird.init.d.debian.in
+ M builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
+Fixed SS startup scripts
+
+ 2013-07-29 06:56 dimitr
+ M src/jrd/Optimizer.cpp
+ M src/jrd/Optimizer.h
+Fixed the optimization improvement accidentally broken by a recent commit.
+
+ 2013-07-29 04:40 dimitr
+ M src/isql/isql.epp
+Follow the alphabetical order of options.
+
2013-07-28 01:10 asfernandes
M src/dsql/dsql.cpp
M src/isql/isql.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-30 07:51:28 UTC (rev 58436)
+++ firebird/trunk/src/jrd/build_no.h 2013-07-31 00:30:50 UTC (rev 58437)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30560
+ FORMAL BUILD NUMBER:30566
*/
-#define PRODUCT_VER_STRING "3.0.0.30560"
-#define FILE_VER_STRING "WI-T3.0.0.30560"
-#define LICENSE_VER_STRING "WI-T3.0.0.30560"
-#define FILE_VER_NUMBER 3, 0, 0, 30560
+#define PRODUCT_VER_STRING "3.0.0.30566"
+#define FILE_VER_STRING "WI-T3.0.0.30566"
+#define LICENSE_VER_STRING "WI-T3.0.0.30566"
+#define FILE_VER_NUMBER 3, 0, 0, 30566
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30560"
+#define FB_BUILD_NO "30566"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-30 07:51:28 UTC (rev 58436)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-07-31 00:30:50 UTC (rev 58437)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30560
+BuildNum=30566
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-01 00:25:31
|
Revision: 58440
http://sourceforge.net/p/firebird/code/58440
Author: firebirds
Date: 2013-08-01 00:25:27 +0000 (Thu, 01 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-07-31 08:33:08 UTC (rev 58439)
+++ firebird/trunk/ChangeLog 2013-08-01 00:25:27 UTC (rev 58440)
@@ -1,3 +1,9 @@
+ 2013-07-31 01:21 asfernandes
+ M src/common/MsgMetadata.h
+ M src/common/config/os/darwin/config_root.cpp
+ M src/common/os/darwin/mod_loader.cpp
+Misc.
+
2013-07-30 06:56 paul_reeves
M builds/install/arch-specific/win32/BuildExecutableInstall.bat
M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-07-31 08:33:08 UTC (rev 58439)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-01 00:25:27 UTC (rev 58440)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30566
+ FORMAL BUILD NUMBER:30567
*/
-#define PRODUCT_VER_STRING "3.0.0.30566"
-#define FILE_VER_STRING "WI-T3.0.0.30566"
-#define LICENSE_VER_STRING "WI-T3.0.0.30566"
-#define FILE_VER_NUMBER 3, 0, 0, 30566
+#define PRODUCT_VER_STRING "3.0.0.30567"
+#define FILE_VER_STRING "WI-T3.0.0.30567"
+#define LICENSE_VER_STRING "WI-T3.0.0.30567"
+#define FILE_VER_NUMBER 3, 0, 0, 30567
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30566"
+#define FB_BUILD_NO "30567"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-07-31 08:33:08 UTC (rev 58439)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-01 00:25:27 UTC (rev 58440)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30566
+BuildNum=30567
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-03 00:25:31
|
Revision: 58443
http://sourceforge.net/p/firebird/code/58443
Author: firebirds
Date: 2013-08-03 00:25:28 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-02 15:35:56 UTC (rev 58442)
+++ firebird/trunk/ChangeLog 2013-08-03 00:25:28 UTC (rev 58443)
@@ -1,3 +1,7 @@
+ 2013-08-02 15:35 asfernandes
+ M src/dsql/parse.y
+Fixed CORE-4155 - External routines in packages wrong removed the necessity of termination with a semi-colon.
+
2013-07-31 01:21 asfernandes
M src/common/MsgMetadata.h
M src/common/config/os/darwin/config_root.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-02 15:35:56 UTC (rev 58442)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-03 00:25:28 UTC (rev 58443)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30567
+ FORMAL BUILD NUMBER:30568
*/
-#define PRODUCT_VER_STRING "3.0.0.30567"
-#define FILE_VER_STRING "WI-T3.0.0.30567"
-#define LICENSE_VER_STRING "WI-T3.0.0.30567"
-#define FILE_VER_NUMBER 3, 0, 0, 30567
+#define PRODUCT_VER_STRING "3.0.0.30568"
+#define FILE_VER_STRING "WI-T3.0.0.30568"
+#define LICENSE_VER_STRING "WI-T3.0.0.30568"
+#define FILE_VER_NUMBER 3, 0, 0, 30568
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30567"
+#define FB_BUILD_NO "30568"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-02 15:35:56 UTC (rev 58442)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-03 00:25:28 UTC (rev 58443)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30567
+BuildNum=30568
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2013-08-04 15:19:34
|
Revision: 58455
http://sourceforge.net/p/firebird/code/58455
Author: dimitr
Date: 2013-08-04 15:19:31 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Fixed CORE-4164: Owner name is missing for generators/exceptions restored from a backup.
Also propagated the sysflag/owner/secclass assignment and validation to all object types and wiped out the duplicating system triggers.
Warning: testing is required!
Modified Paths:
--------------
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/jrd/ini.epp
firebird/trunk/src/jrd/trig.h
firebird/trunk/src/jrd/vio.cpp
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2013-08-04 15:19:31 UTC (rev 58455)
@@ -1526,6 +1526,8 @@
PARAMETER (GDS__include_depth = 335545056)
INTEGER*4 GDS__include_miss
PARAMETER (GDS__include_miss = 335545057)
+ INTEGER*4 GDS__protect_ownership
+ PARAMETER (GDS__protect_ownership = 335545058)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2013-08-04 15:19:31 UTC (rev 58455)
@@ -770,6 +770,7 @@
gds_conf_include = 335545055;
gds_include_depth = 335545056;
gds_include_miss = 335545057;
+ gds_protect_ownership = 335545058;
gds_gfix_db_name = 335740929;
gds_gfix_invalid_sw = 335740930;
gds_gfix_incmp_sw = 335740932;
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/include/gen/codetext.h 2013-08-04 15:19:31 UTC (rev 58455)
@@ -759,6 +759,7 @@
{"conf_include", 335545055},
{"include_depth", 335545056},
{"include_miss", 335545057},
+ {"protect_ownership", 335545058},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/include/gen/iberror.h 2013-08-04 15:19:31 UTC (rev 58455)
@@ -793,6 +793,7 @@
const ISC_STATUS isc_conf_include = 335545055L;
const ISC_STATUS isc_include_depth = 335545056L;
const ISC_STATUS isc_include_miss = 335545057L;
+const ISC_STATUS isc_protect_ownership = 335545058L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1237,7 +1238,7 @@
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
-const ISC_STATUS isc_err_max = 1181;
+const ISC_STATUS isc_err_max = 1182;
#else /* c definitions */
@@ -2000,6 +2001,7 @@
#define isc_conf_include 335545055L
#define isc_include_depth 335545056L
#define isc_include_miss 335545057L
+#define isc_protect_ownership 335545058L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2444,7 +2446,7 @@
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1181
+#define isc_err_max 1182
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/include/gen/msgs.h 2013-08-04 15:19:31 UTC (rev 58455)
@@ -762,6 +762,7 @@
{335545055, "Invalid include operator in @1 for <@2>"}, /* conf_include */
{335545056, "Include depth too big"}, /* include_depth */
{335545057, "File to include not found"}, /* include_miss */
+ {335545058, "Only the owner can change the ownership"}, /* protect_ownership */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/include/gen/sql_code.h 2013-08-04 15:19:31 UTC (rev 58455)
@@ -758,6 +758,7 @@
{335545055, -902}, /* 735 conf_include */
{335545056, -902}, /* 736 include_depth */
{335545057, -902}, /* 737 include_miss */
+ {335545058, -552}, /* 738 protect_ownership */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/include/gen/sql_state.h 2013-08-04 15:19:31 UTC (rev 58455)
@@ -758,6 +758,7 @@
{335545055, "XX000"}, // 735 conf_include
{335545056, "XX000"}, // 736 include_depth
{335545057, "XX000"}, // 737 include_miss
+ {335545058, "28000"}, // 738 protect_ownership
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/jrd/ini.epp
===================================================================
--- firebird/trunk/src/jrd/ini.epp 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/jrd/ini.epp 2013-08-04 15:19:31 UTC (rev 58455)
@@ -105,15 +105,6 @@
{ "RDB$TRIGGER_3", (UCHAR) nam_trgs,
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_ERASE, sizeof(trigger4), trigger4,
0, ODS_8_0 },
- { "RDB$TRIGGER_4", (UCHAR) nam_relations,
- RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger5), trigger5,
- 0, ODS_8_0 },
- { "RDB$TRIGGER_5", (UCHAR) nam_relations,
- RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger6), trigger6,
- 0, ODS_8_0 },
- { "RDB$TRIGGER_6", (UCHAR) nam_gens,
- RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger7), trigger7,
- 0, ODS_8_0 },
{ "RDB$TRIGGER_26", (UCHAR) nam_rel_constr,
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger26), trigger26,
0, ODS_8_0 },
@@ -168,15 +159,6 @@
{ "RDB$TRIGGER_27", (UCHAR) nam_r_fields,
RDB$TRIGGERS.RDB$TRIGGER_TYPE.POST_ERASE, sizeof(trigger27),
trigger27, 0, ODS_8_0 },
- { "RDB$TRIGGER_28", (UCHAR) nam_procedures,
- RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger28), trigger28,
- 0, ODS_8_0 },
- { "RDB$TRIGGER_29", (UCHAR) nam_procedures,
- RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger29),
- trigger29, 0, ODS_8_0 },
- { "RDB$TRIGGER_30", (UCHAR) nam_exceptions,
- RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_STORE, sizeof(trigger30), trigger30,
- 0, ODS_8_0 },
{ "RDB$TRIGGER_31", (UCHAR) nam_user_privileges,
RDB$TRIGGERS.RDB$TRIGGER_TYPE.PRE_MODIFY, sizeof(trigger31),
trigger31, 0, ODS_8_1 },
@@ -212,7 +194,6 @@
{ "RDB$TRIGGER_1", 0, "existing_priv_mod", ODS_8_0 },
{ "RDB$TRIGGER_2", 0, "systrig_update", ODS_8_0 },
{ "RDB$TRIGGER_3", 0, "systrig_update", ODS_8_0 },
- { "RDB$TRIGGER_5", 0, "not_rel_owner", ODS_8_0 },
{ "RDB$TRIGGER_24", 1, "cnstrnt_fld_rename", ODS_8_0 },
{ "RDB$TRIGGER_23", 1, "cnstrnt_fld_del", ODS_8_0 },
{ "RDB$TRIGGER_22", 1, "check_trig_update", ODS_8_0 },
Modified: firebird/trunk/src/jrd/trig.h
===================================================================
--- firebird/trunk/src/jrd/trig.h 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/jrd/trig.h 2013-08-04 15:19:31 UTC (rev 58455)
@@ -1106,68 +1106,6 @@
};
-static const UCHAR trigger5[] =
-{
- blr_version5,
- blr_if,
- blr_missing,
- blr_field, 1, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_assignment,
- blr_upcase,
- blr_user_name,
- blr_field, 1, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_end,
- blr_eoc
-};
-
-
-/******
-static const TEXT trigger_6_msg_0 [] = "only the owner of a relation may reassign ownership";
-******/
-
-static const UCHAR trigger6[] =
-{
- blr_version5,
- blr_if,
- blr_and,
- blr_neq,
- blr_field, 0, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_field, 1, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_neq,
- blr_field, 0, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_upcase,
- blr_user_name,
- blr_leave, 0,
- blr_end,
- blr_eoc
-};
-
-
-static const UCHAR trigger7[] =
-{
- blr_version5,
- blr_begin,
- blr_if,
- blr_missing,
- blr_field, 1, 16, 'R', 'D', 'B', '$', 'G', 'E', 'N', 'E', 'R', 'A', 'T',
- 'O', 'R', '_', 'I', 'D',
- blr_assignment,
- blr_gen_id, 14, 'R', 'D', 'B', '$', 'G', 'E', 'N', 'E', 'R', 'A', 'T',
- 'O', 'R', 'S',
- blr_literal, blr_long, 0, 1, 0, 0, 0,
- blr_field, 1, 16, 'R', 'D', 'B', '$', 'G', 'E', 'N', 'E', 'R', 'A', 'T',
- 'O', 'R', '_', 'I', 'D',
- blr_end,
- blr_end,
- blr_eoc
-};
-
-
/* define trigger add_constraint for rdb$relation_constraints */
/******
@@ -2444,77 +2382,6 @@
};
-static const UCHAR trigger28[] =
-{
- blr_version5,
- blr_begin,
- blr_if,
- blr_missing,
- blr_field, 1, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_assignment,
- blr_upcase,
- blr_user_name,
- blr_field, 1, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_end,
- blr_if,
- blr_missing,
- blr_field, 1, 16, 'R', 'D', 'B', '$', 'P', 'R', 'O', 'C', 'E', 'D', 'U',
- 'R', 'E', '_', 'I', 'D',
- blr_assignment,
- blr_gen_id, 14, 'R', 'D', 'B', '$', 'P', 'R', 'O', 'C', 'E', 'D', 'U',
- 'R', 'E', 'S',
- blr_literal, blr_long, 0, 1, 0, 0, 0,
- blr_field, 1, 16, 'R', 'D', 'B', '$', 'P', 'R', 'O', 'C', 'E', 'D', 'U',
- 'R', 'E', '_', 'I', 'D',
- blr_end,
- blr_end,
- blr_eoc
-};
-
-
-static const UCHAR trigger29[] =
-{
- blr_version5,
- blr_if,
- blr_and,
- blr_neq,
- blr_field, 0, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_field, 1, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_neq,
- blr_field, 0, 14, 'R', 'D', 'B', '$', 'O', 'W', 'N', 'E', 'R', '_', 'N',
- 'A', 'M', 'E',
- blr_upcase,
- blr_user_name,
- blr_leave, 0,
- blr_end,
- blr_eoc
-};
-
-
-static const UCHAR trigger30[] =
-{
- blr_version5,
- blr_begin,
- blr_if,
- blr_missing,
- blr_field, 1, 20, 'R', 'D', 'B', '$', 'E', 'X', 'C', 'E', 'P', 'T', 'I',
- 'O', 'N', '_', 'N', 'U', 'M', 'B', 'E', 'R',
- blr_assignment,
- blr_gen_id, 14, 'R', 'D', 'B', '$', 'E', 'X', 'C', 'E', 'P', 'T', 'I',
- 'O', 'N', 'S',
- blr_literal, blr_long, 0, 1, 0, 0, 0,
- blr_field, 1, 20, 'R', 'D', 'B', '$', 'E', 'X', 'C', 'E', 'P', 'T', 'I',
- 'O', 'N', '_', 'N', 'U', 'M', 'B', 'E', 'R',
- blr_end,
- blr_end,
- blr_eoc
-};
-
-
/* new trigger to create ODS 8.1 (and to upgrade from ODS 8.0 to ODS 8.1 */
static const UCHAR trigger31[] =
{
Modified: firebird/trunk/src/jrd/vio.cpp
===================================================================
--- firebird/trunk/src/jrd/vio.cpp 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/jrd/vio.cpp 2013-08-04 15:19:31 UTC (rev 58455)
@@ -96,6 +96,7 @@
using namespace Firebird;
static void check_class(thread_db*, jrd_tra*, record_param*, record_param*, USHORT);
+static void check_owner(thread_db*, jrd_tra*, record_param*, record_param*, USHORT);
static bool check_user(thread_db*, const dsc*);
static int check_precommitted(const jrd_tra*, const record_param*);
static void check_rel_field_class(thread_db*, record_param*, SecurityClass::flags_t, jrd_tra*);
@@ -161,8 +162,9 @@
static Record* replace_gc_record(jrd_rel*, Record**, USHORT);
static void replace_record(thread_db*, record_param*, PageStack*, const jrd_tra*);
static SSHORT set_metadata_id(thread_db*, Record*, USHORT, drq_type_t, const char*);
+static void set_owner_name(thread_db*, Record*, USHORT);
static void set_security_class(thread_db*, Record*, USHORT);
-static void set_system_flag(thread_db*, Record*, USHORT, SSHORT);
+static void set_system_flag(thread_db*, Record*, USHORT);
static void update_in_place(thread_db*, jrd_tra*, record_param*, record_param*);
static void verb_post(thread_db*, jrd_tra*, record_param*, Record*, const bool, const bool);
@@ -2361,6 +2363,7 @@
EVL_field(0, org_rpb->rpb_record, f_rel_name, &desc1);
SCL_check_relation(tdbb, &desc1, SCL_alter);
check_class(tdbb, transaction, org_rpb, new_rpb, f_rel_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_rel_owner);
DFW_post_work(transaction, dfw_update_format, &desc1, 0);
break;
@@ -2368,6 +2371,7 @@
if (EVL_field(0, org_rpb->rpb_record, f_pkg_name, &desc1))
SCL_check_package(tdbb, &desc1, SCL_alter);
check_class(tdbb, transaction, org_rpb, new_rpb, f_pkg_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_pkg_owner);
break;
case rel_procedures:
@@ -2384,6 +2388,7 @@
}
check_class(tdbb, transaction, org_rpb, new_rpb, f_prc_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_prc_owner);
if (dfw_should_know(org_rpb, new_rpb, f_prc_desc, true))
{
@@ -2407,6 +2412,7 @@
}
check_class(tdbb, transaction, org_rpb, new_rpb, f_fun_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_fun_owner);
if (dfw_should_know(org_rpb, new_rpb, f_fun_desc, true))
{
@@ -2420,6 +2426,8 @@
EVL_field(0, org_rpb->rpb_record, f_gen_name, &desc1);
MOV_get_metaname(&desc1, object_name);
SCL_check_generator(tdbb, object_name, SCL_alter);
+ check_class(tdbb, transaction, org_rpb, new_rpb, f_gen_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_gen_owner);
break;
case rel_rfr:
@@ -2479,6 +2487,8 @@
if ((!rc1 || MOV_get_long(&desc3, 0) == 0) && rc2 && MOV_get_long(&desc4, 0) != 0)
DFW_post_work_arg(transaction, dw, &desc2, 0, dfw_arg_field_not_null);
}
+ check_class(tdbb, transaction, org_rpb, new_rpb, f_fld_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_fld_owner);
break;
case rel_classes:
@@ -2553,18 +2563,24 @@
EVL_field(0, new_rpb->rpb_record, f_cs_cs_name, &desc1);
MOV_get_metaname(&desc1, object_name);
SCL_check_charset(tdbb, object_name, SCL_alter);
+ check_class(tdbb, transaction, org_rpb, new_rpb, f_cs_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_cs_owner);
break;
case rel_collations:
EVL_field(0, new_rpb->rpb_record, f_coll_name, &desc1);
MOV_get_metaname(&desc1, object_name);
SCL_check_collation(tdbb, object_name, SCL_alter);
+ check_class(tdbb, transaction, org_rpb, new_rpb, f_coll_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_coll_owner);
break;
case rel_exceptions:
EVL_field(0, new_rpb->rpb_record, f_xcp_name, &desc1);
MOV_get_metaname(&desc1, object_name);
SCL_check_exception(tdbb, object_name, SCL_alter);
+ check_class(tdbb, transaction, org_rpb, new_rpb, f_xcp_class);
+ check_owner(tdbb, transaction, org_rpb, new_rpb, f_xcp_owner);
break;
default:
@@ -2874,8 +2890,11 @@
*
**************************************/
SET_TDBB(tdbb);
- jrd_req* request = tdbb->getRequest();
+ jrd_req* const request = tdbb->getRequest();
+
DeferredWork* work = NULL;
+ MetaName package_name;
+ USHORT object_id;
#ifdef VIO_DEBUG
VIO_trace(DEBUG_WRITES,
@@ -2896,24 +2915,28 @@
EVL_field(0, rpb->rpb_record, f_rel_name, &desc);
DFW_post_work(transaction, dfw_create_relation, &desc, 0);
DFW_post_work(transaction, dfw_update_format, &desc, 0);
- set_system_flag(tdbb, rpb->rpb_record, f_rel_sys_flag, 0);
+ set_system_flag(tdbb, rpb->rpb_record, f_rel_sys_flag);
+ set_security_class(tdbb, rpb->rpb_record, f_rel_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_rel_owner);
break;
case rel_packages:
- set_system_flag(tdbb, rpb->rpb_record, f_pkg_sys_flag, 0);
+ set_system_flag(tdbb, rpb->rpb_record, f_pkg_sys_flag);
+ set_security_class(tdbb, rpb->rpb_record, f_pkg_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_pkg_owner);
break;
case rel_procedures:
EVL_field(0, rpb->rpb_record, f_prc_name, &desc);
- { // scope
- MetaName package_name;
- if (EVL_field(0, rpb->rpb_record, f_prc_pkg_name, &desc2))
- MOV_get_metaname(&desc2, package_name);
- EVL_field(0, rpb->rpb_record, f_prc_id, &desc2);
- const USHORT id = MOV_get_long(&desc2, 0);
- work = DFW_post_work(transaction, dfw_create_procedure, &desc, id, package_name);
+ if (EVL_field(0, rpb->rpb_record, f_prc_pkg_name, &desc2))
+ MOV_get_metaname(&desc2, package_name);
+ object_id = set_metadata_id(tdbb, rpb->rpb_record,
+ f_prc_id, drq_g_nxt_prc_id, "RDB$PROCEDURES");
+ work = DFW_post_work(transaction, dfw_create_procedure, &desc, object_id, package_name);
+
+ { // scope
bool check_blr = true;
if (EVL_field(0, rpb->rpb_record, f_prc_valid_blr, &desc2))
check_blr = MOV_get_long(&desc2, 0) != 0;
@@ -2921,22 +2944,23 @@
if (check_blr)
DFW_post_work_arg(transaction, work, NULL, 0, dfw_arg_check_blr);
} // scope
- set_system_flag(tdbb, rpb->rpb_record, f_prc_sys_flag, 0);
+
+ set_system_flag(tdbb, rpb->rpb_record, f_prc_sys_flag);
+ set_security_class(tdbb, rpb->rpb_record, f_prc_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_prc_owner);
break;
case rel_funs:
EVL_field(0, rpb->rpb_record, f_fun_name, &desc);
- { // scope
- MetaName package_name;
- if (EVL_field(0, rpb->rpb_record, f_fun_pkg_name, &desc2))
- MOV_get_metaname(&desc2, package_name);
- const USHORT id =
- set_metadata_id(tdbb, rpb->rpb_record, f_fun_id, drq_g_nxt_fun_id, "RDB$FUNCTIONS");
- work = DFW_post_work(transaction, dfw_create_function, &desc, id, package_name);
+ if (EVL_field(0, rpb->rpb_record, f_fun_pkg_name, &desc2))
+ MOV_get_metaname(&desc2, package_name);
- set_security_class(tdbb, rpb->rpb_record, f_fun_class);
+ object_id = set_metadata_id(tdbb, rpb->rpb_record,
+ f_fun_id, drq_g_nxt_fun_id, "RDB$FUNCTIONS");
+ work = DFW_post_work(transaction, dfw_create_function, &desc, object_id, package_name);
+ { // scope
bool check_blr = true;
if (EVL_field(0, rpb->rpb_record, f_fun_valid_blr, &desc2))
check_blr = MOV_get_long(&desc2, 0) != 0;
@@ -2944,7 +2968,10 @@
if (check_blr)
DFW_post_work_arg(transaction, work, NULL, 0, dfw_arg_check_blr);
} // scope
- set_system_flag(tdbb, rpb->rpb_record, f_fun_sys_flag, 0);
+
+ set_system_flag(tdbb, rpb->rpb_record, f_fun_sys_flag);
+ set_security_class(tdbb, rpb->rpb_record, f_fun_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_fun_owner);
break;
case rel_indices:
@@ -2959,13 +2986,14 @@
else {
DFW_post_work(transaction, dfw_create_index, &desc, tdbb->getDatabase()->dbb_max_idx);
}
+ set_system_flag(tdbb, rpb->rpb_record, f_idx_sys_flag);
break;
case rel_rfr:
EVL_field(0, rpb->rpb_record, f_rfr_rname, &desc);
SCL_check_relation(tdbb, &desc, SCL_control);
DFW_post_work(transaction, dfw_update_format, &desc, 0);
- set_system_flag(tdbb, rpb->rpb_record, f_rfr_sys_flag, 0);
+ set_system_flag(tdbb, rpb->rpb_record, f_rfr_sys_flag);
break;
case rel_classes:
@@ -2976,8 +3004,9 @@
case rel_fields:
EVL_field(0, rpb->rpb_record, f_fld_name, &desc);
DFW_post_work(transaction, dfw_create_field, &desc, 0);
- set_system_flag(tdbb, rpb->rpb_record, f_fld_sys_flag, 0);
+ set_system_flag(tdbb, rpb->rpb_record, f_fld_sys_flag);
set_security_class(tdbb, rpb->rpb_record, f_fld_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_fld_owner);
break;
case rel_files:
@@ -3016,9 +3045,8 @@
EVL_field(0, rpb->rpb_record, f_trg_rname, &desc);
// check if this request go through without checking permissions
- if (!(request->getStatement()->flags & JrdStatement::FLAG_IGNORE_PERM)) {
+ if (!(request->getStatement()->flags & JrdStatement::FLAG_IGNORE_PERM))
SCL_check_relation(tdbb, &desc, SCL_control);
- }
if (EVL_field(0, rpb->rpb_record, f_trg_rname, &desc2))
DFW_post_work(transaction, dfw_update_format, &desc2, 0);
@@ -3034,16 +3062,14 @@
DFW_post_work_arg(transaction, work, &desc2,
(USHORT) MOV_get_int64(&desc2, 0), dfw_arg_trg_type);
}
-
+ set_system_flag(tdbb, rpb->rpb_record, f_trg_sys_flag);
break;
case rel_priv:
EVL_field(0, rpb->rpb_record, f_prv_rname, &desc);
EVL_field(0, rpb->rpb_record, f_prv_o_type, &desc2);
- { // scope
- const USHORT id = MOV_get_long(&desc2, 0);
- DFW_post_work(transaction, dfw_grant, &desc, id);
- } // scope
+ object_id = MOV_get_long(&desc2, 0);
+ DFW_post_work(transaction, dfw_grant, &desc, object_id);
break;
case rel_vrel:
@@ -3062,24 +3088,33 @@
case rel_gens:
EVL_field(0, rpb->rpb_record, f_gen_name, &desc);
EVL_field(0, rpb->rpb_record, f_gen_id, &desc2);
- {
- const USHORT id = MOV_get_long(&desc2, 0);
- transaction->getGenIdCache()->put(id, 0);
- DFW_post_work(transaction, dfw_set_generator, &desc, id);
- }
+ object_id = set_metadata_id(tdbb, rpb->rpb_record,
+ f_gen_id, drq_g_nxt_gen_id, "RDB$GENERATORS");
+ transaction->getGenIdCache()->put(object_id, 0);
+ DFW_post_work(transaction, dfw_set_generator, &desc, object_id);
+ set_system_flag(tdbb, rpb->rpb_record, f_gen_sys_flag);
set_security_class(tdbb, rpb->rpb_record, f_gen_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_gen_owner);
break;
case rel_charsets:
+ set_system_flag(tdbb, rpb->rpb_record, f_cs_sys_flag);
set_security_class(tdbb, rpb->rpb_record, f_cs_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_cs_owner);
break;
case rel_collations:
+ set_system_flag(tdbb, rpb->rpb_record, f_coll_sys_flag);
set_security_class(tdbb, rpb->rpb_record, f_coll_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_coll_owner);
break;
case rel_exceptions:
+ set_metadata_id(tdbb, rpb->rpb_record,
+ f_xcp_number, drq_g_nxt_xcp_id, "RDB$EXCEPTIONS");
+ set_system_flag(tdbb, rpb->rpb_record, f_xcp_sys_flag);
set_security_class(tdbb, rpb->rpb_record, f_xcp_class);
+ set_owner_name(tdbb, rpb->rpb_record, f_xcp_owner);
break;
default: // Shut up compiler warnings
@@ -3788,6 +3823,40 @@
}
+static void check_owner(thread_db* tdbb,
+ jrd_tra* transaction,
+ record_param* old_rpb, record_param* new_rpb, USHORT id)
+{
+/**************************************
+ *
+ * c h e c k _ o w n e r
+ *
+ **************************************
+ *
+ * Functional description
+ * A record in a system relation containing an owner is
+ * being changed. Check to see if the owner has changed,
+ * and if so, validate whether this action is allowed.
+ *
+ **************************************/
+ SET_TDBB(tdbb);
+
+ DSC desc1, desc2;
+ EVL_field(0, old_rpb->rpb_record, id, &desc1);
+ EVL_field(0, new_rpb->rpb_record, id, &desc2);
+ if (!MOV_compare(&desc1, &desc2))
+ return;
+
+ const Jrd::Attachment* const attachment = tdbb->getAttachment();
+ const Firebird::MetaName name(attachment->att_user->usr_user_name);
+ desc2.makeText((USHORT) name.length(), CS_METADATA, (UCHAR*) name.c_str());
+ if (!MOV_compare(&desc1, &desc2))
+ return;
+
+ ERR_post(Arg::Gds(isc_protect_ownership));
+}
+
+
static bool check_user(thread_db* tdbb, const dsc* desc)
{
/**************************************
@@ -5393,9 +5462,7 @@
dsc desc1;
if (EVL_field(0, record, field_id, &desc1))
- {
return MOV_get_long(&desc1, 0);
- }
SSHORT value = (SSHORT) DYN_UTIL_gen_unique_id(tdbb, dyn_id, name);
dsc desc2;
@@ -5406,6 +5473,32 @@
}
+static void set_owner_name(thread_db* tdbb, Record* record, USHORT field_id)
+{
+/**************************************
+ *
+ * s e t _ o w n e r _ n a m e
+ *
+ **************************************
+ *
+ * Functional description
+ * Set the owner name for the metadata object.
+ *
+ **************************************/
+ dsc desc1;
+
+ if (!EVL_field(0, record, field_id, &desc1))
+ {
+ const Jrd::Attachment* const attachment = tdbb->getAttachment();
+ const Firebird::MetaName name(attachment->att_user->usr_user_name);
+ dsc desc2;
+ desc2.makeText((USHORT) name.length(), CS_METADATA, (UCHAR*) name.c_str());
+ MOV_move(tdbb, &desc2, &desc1);
+ record->clearNull(field_id);
+ }
+}
+
+
static void set_security_class(thread_db* tdbb, Record* record, USHORT field_id)
{
/**************************************
@@ -5433,7 +5526,7 @@
}
-static void set_system_flag(thread_db* tdbb, Record* record, USHORT field_id, SSHORT flag)
+static void set_system_flag(thread_db* tdbb, Record* record, USHORT field_id)
{
/**************************************
*
@@ -5447,14 +5540,14 @@
**************************************/
dsc desc1;
- if (EVL_field(0, record, field_id, &desc1)) {
- return;
+ if (!EVL_field(0, record, field_id, &desc1))
+ {
+ SSHORT flag = 0;
+ dsc desc2;
+ desc2.makeShort(0, &flag);
+ MOV_move(tdbb, &desc2, &desc1);
+ record->clearNull(field_id);
}
-
- dsc desc2;
- desc2.makeShort(0, &flag);
- MOV_move(tdbb, &desc2, &desc1);
- record->clearNull(field_id);
}
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/msgs/facilities2.sql 2013-08-04 15:19:31 UTC (rev 58455)
@@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
-('2013-03-26 17:52:41', 'JRD', 0, 738)
+('2013-03-26 17:52:41', 'JRD', 0, 739)
('2012-01-23 20:10:30', 'QLI', 1, 532)
('2009-07-16 05:26:11', 'GFIX', 3, 121)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/msgs/messages2.sql 2013-08-04 15:19:31 UTC (rev 58455)
@@ -845,6 +845,7 @@
('conf_include', NULL, 'config_file.cpp', NULL, 0, 735, NULL, 'Invalid include operator in @1 for <@2>', NULL, NULL);
('include_depth', NULL, 'config_file.cpp', NULL, 0, 736, NULL, 'Include depth too big', NULL, NULL);
('include_miss', NULL, 'config_file.cpp', NULL, 0, 737, NULL, 'File to include not found', NULL, NULL);
+('protect_ownership', 'check_owner', 'vio.cpp', NULL, 0, 738, NULL, 'Only the owner can change the ownership', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2013-08-04 11:12:49 UTC (rev 58454)
+++ firebird/trunk/src/msgs/system_errors2.sql 2013-08-04 15:19:31 UTC (rev 58455)
@@ -744,6 +744,7 @@
(-902, 'XX', '000', 0, 735, 'conf_include', NULL, NULL)
(-902, 'XX', '000', 0, 736, 'include_depth', NULL, NULL)
(-902, 'XX', '000', 0, 737, 'include_miss', NULL, NULL)
+(-552, '28', '000', 0, 738, 'protect_ownership', NULL, NULL)
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-05 00:23:44
|
Revision: 58457
http://sourceforge.net/p/firebird/code/58457
Author: firebirds
Date: 2013-08-05 00:23:40 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-04 19:39:13 UTC (rev 58456)
+++ firebird/trunk/ChangeLog 2013-08-05 00:23:40 UTC (rev 58457)
@@ -1,3 +1,38 @@
+ 2013-08-04 19:39 asfernandes
+ M src/jrd/SysFunction.cpp
+Fixed CORE-4156 - RDB$GET_CONTEXT/RDB$SET_CONTEXT parameters incorrectly described as CHAR NOT NULL instead of VARCHAR NULLABLE.
+
+ 2013-08-04 15:19 dimitr
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/include/gen/codetext.h
+ M src/include/gen/iberror.h
+ M src/include/gen/msgs.h
+ M src/include/gen/sql_code.h
+ M src/include/gen/sql_state.h
+ M src/jrd/ini.epp
+ M src/jrd/trig.h
+ M src/jrd/vio.cpp
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+Fixed CORE-4164: Owner name is missing for generators/exceptions restored from a backup.
+Also propagated the sysflag/owner/secclass assignment and validation to all object types and wiped out the duplicating system triggers.
+Warning: testing is required!
+
+ 2013-08-04 09:35 dimitr
+ M src/common/classes/alloc.cpp
+Fixed the negative/too-big numbers in the memory stats (CORE-4159).
+
+ 2013-08-04 07:31 dimitr
+ M src/jrd/cch.cpp
+ M src/jrd/cch.h
+Fixed the page cache stats not being reported (CORE-4159).
+
+ 2013-08-04 01:20 asfernandes
+ M src/jrd/opt.cpp
+Fixed CORE-4158 - LIKE with escape doesn't work.
+
2013-08-02 15:35 asfernandes
M src/dsql/parse.y
Fixed CORE-4155 - External routines in packages wrong removed the necessity of termination with a semi-colon.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-04 19:39:13 UTC (rev 58456)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-05 00:23:40 UTC (rev 58457)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30568
+ FORMAL BUILD NUMBER:30573
*/
-#define PRODUCT_VER_STRING "3.0.0.30568"
-#define FILE_VER_STRING "WI-T3.0.0.30568"
-#define LICENSE_VER_STRING "WI-T3.0.0.30568"
-#define FILE_VER_NUMBER 3, 0, 0, 30568
+#define PRODUCT_VER_STRING "3.0.0.30573"
+#define FILE_VER_STRING "WI-T3.0.0.30573"
+#define LICENSE_VER_STRING "WI-T3.0.0.30573"
+#define FILE_VER_NUMBER 3, 0, 0, 30573
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30568"
+#define FB_BUILD_NO "30573"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-04 19:39:13 UTC (rev 58456)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-05 00:23:40 UTC (rev 58457)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30568
+BuildNum=30573
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-06 00:24:08
|
Revision: 58470
http://sourceforge.net/p/firebird/code/58470
Author: firebirds
Date: 2013-08-06 00:24:04 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-05 16:11:15 UTC (rev 58469)
+++ firebird/trunk/ChangeLog 2013-08-06 00:24:04 UTC (rev 58470)
@@ -1,3 +1,24 @@
+ 2013-08-05 16:11 dimitr
+ M src/jrd/recsrc/SortedStream.cpp
+A bit more information for the plan.
+
+ 2013-08-05 15:58 dimitr
+ M src/jrd/opt.cpp
+Cleanup.
+
+ 2013-08-05 14:48 dimitr
+ M src/dsql/parse.y
+Simplest solution for CORE-4165: Replace the hierarchical union execution with the plain one.
+
+ 2013-08-05 13:08 paul_reeves
+ M builds/install/arch-specific/win32/FirebirdInstall_30.iss
+Fix CORE-4153 - write out changes to firebird.conf before starting the server
+
+ 2013-08-05 11:59 dimitr
+ M src/isql/isql.epp
+ M src/isql/isql.h
+Increased the plan buffer size in ISQL to accomodate the detailed plan output.
+
2013-08-04 19:39 asfernandes
M src/jrd/SysFunction.cpp
Fixed CORE-4156 - RDB$GET_CONTEXT/RDB$SET_CONTEXT parameters incorrectly described as CHAR NOT NULL instead of VARCHAR NULLABLE.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-05 16:11:15 UTC (rev 58469)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-06 00:24:04 UTC (rev 58470)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30573
+ FORMAL BUILD NUMBER:30578
*/
-#define PRODUCT_VER_STRING "3.0.0.30573"
-#define FILE_VER_STRING "WI-T3.0.0.30573"
-#define LICENSE_VER_STRING "WI-T3.0.0.30573"
-#define FILE_VER_NUMBER 3, 0, 0, 30573
+#define PRODUCT_VER_STRING "3.0.0.30578"
+#define FILE_VER_STRING "WI-T3.0.0.30578"
+#define LICENSE_VER_STRING "WI-T3.0.0.30578"
+#define FILE_VER_NUMBER 3, 0, 0, 30578
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30573"
+#define FB_BUILD_NO "30578"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-05 16:11:15 UTC (rev 58469)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-06 00:24:04 UTC (rev 58470)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30573
+BuildNum=30578
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-07 00:24:36
|
Revision: 58474
http://sourceforge.net/p/firebird/code/58474
Author: firebirds
Date: 2013-08-07 00:24:33 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-06 18:49:49 UTC (rev 58473)
+++ firebird/trunk/ChangeLog 2013-08-07 00:24:33 UTC (rev 58474)
@@ -1,3 +1,21 @@
+ 2013-08-06 18:49 dimitr
+ M src/jrd/ext.cpp
+Fixed CORE-4168: Backup containing procedures or triggers that select from external tables cannot be restored with ExternalFileAccess=None.
+
+ 2013-08-06 09:37 dimitr
+ M src/dsql/AggNodes.cpp
+ M src/jrd/Database.cpp
+ M src/jrd/Database.h
+ M src/jrd/idx.cpp
+ M src/jrd/recsrc/SortedStream.cpp
+ M src/jrd/sort.cpp
+ M src/jrd/sort.h
+Front ported CORE-3989: Bad performance / slow response when many concurrent sorts are executed.
+
+ 2013-08-06 08:49 paul_reeves
+ M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+Be less specific about version when detecting if a version of firebird is running at installation time.
+
2013-08-05 16:11 dimitr
M src/jrd/recsrc/SortedStream.cpp
A bit more information for the plan.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-06 18:49:49 UTC (rev 58473)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-07 00:24:33 UTC (rev 58474)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30578
+ FORMAL BUILD NUMBER:30581
*/
-#define PRODUCT_VER_STRING "3.0.0.30578"
-#define FILE_VER_STRING "WI-T3.0.0.30578"
-#define LICENSE_VER_STRING "WI-T3.0.0.30578"
-#define FILE_VER_NUMBER 3, 0, 0, 30578
+#define PRODUCT_VER_STRING "3.0.0.30581"
+#define FILE_VER_STRING "WI-T3.0.0.30581"
+#define LICENSE_VER_STRING "WI-T3.0.0.30581"
+#define FILE_VER_NUMBER 3, 0, 0, 30581
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30578"
+#define FB_BUILD_NO "30581"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-06 18:49:49 UTC (rev 58473)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-07 00:24:33 UTC (rev 58474)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30578
+BuildNum=30581
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-08 00:32:17
|
Revision: 58476
http://sourceforge.net/p/firebird/code/58476
Author: firebirds
Date: 2013-08-08 00:32:15 +0000 (Thu, 08 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-07 09:58:04 UTC (rev 58475)
+++ firebird/trunk/ChangeLog 2013-08-08 00:32:15 UTC (rev 58476)
@@ -1,3 +1,7 @@
+ 2013-08-07 09:58 paul_reeves
+ M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
+Improve installed product detection to support changes in Fb3.
+
2013-08-06 18:49 dimitr
M src/jrd/ext.cpp
Fixed CORE-4168: Backup containing procedures or triggers that select from external tables cannot be restored with ExternalFileAccess=None.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-07 09:58:04 UTC (rev 58475)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-08 00:32:15 UTC (rev 58476)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30581
+ FORMAL BUILD NUMBER:30582
*/
-#define PRODUCT_VER_STRING "3.0.0.30581"
-#define FILE_VER_STRING "WI-T3.0.0.30581"
-#define LICENSE_VER_STRING "WI-T3.0.0.30581"
-#define FILE_VER_NUMBER 3, 0, 0, 30581
+#define PRODUCT_VER_STRING "3.0.0.30582"
+#define FILE_VER_STRING "WI-T3.0.0.30582"
+#define LICENSE_VER_STRING "WI-T3.0.0.30582"
+#define FILE_VER_NUMBER 3, 0, 0, 30582
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30581"
+#define FB_BUILD_NO "30582"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-07 09:58:04 UTC (rev 58475)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-08 00:32:15 UTC (rev 58476)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30581
+BuildNum=30582
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-09 00:26:55
|
Revision: 58478
http://sourceforge.net/p/firebird/code/58478
Author: firebirds
Date: 2013-08-09 00:26:52 +0000 (Fri, 09 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-08 08:41:12 UTC (rev 58477)
+++ firebird/trunk/ChangeLog 2013-08-09 00:26:52 UTC (rev 58478)
@@ -1,3 +1,9 @@
+ 2013-08-08 08:41 hvlad
+ M src/jrd/cch.cpp
+ M src/jrd/cch.h
+Restore scan-resistance feature of the page cache.
+Refactor common code a bit.
+
2013-08-07 09:58 paul_reeves
M builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
Improve installed product detection to support changes in Fb3.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-08 08:41:12 UTC (rev 58477)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-09 00:26:52 UTC (rev 58478)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30582
+ FORMAL BUILD NUMBER:30583
*/
-#define PRODUCT_VER_STRING "3.0.0.30582"
-#define FILE_VER_STRING "WI-T3.0.0.30582"
-#define LICENSE_VER_STRING "WI-T3.0.0.30582"
-#define FILE_VER_NUMBER 3, 0, 0, 30582
+#define PRODUCT_VER_STRING "3.0.0.30583"
+#define FILE_VER_STRING "WI-T3.0.0.30583"
+#define LICENSE_VER_STRING "WI-T3.0.0.30583"
+#define FILE_VER_NUMBER 3, 0, 0, 30583
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30582"
+#define FB_BUILD_NO "30583"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-08 08:41:12 UTC (rev 58477)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-09 00:26:52 UTC (rev 58478)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30582
+BuildNum=30583
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-12 00:36:19
|
Revision: 58487
http://sourceforge.net/p/firebird/code/58487
Author: firebirds
Date: 2013-08-12 00:36:15 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-11 12:07:02 UTC (rev 58486)
+++ firebird/trunk/ChangeLog 2013-08-12 00:36:15 UTC (rev 58487)
@@ -1,3 +1,11 @@
+ 2013-08-09 15:51 dimitr
+ M src/jrd/DatabaseSnapshot.cpp
+Fixed CORE-4176: Monitoring tables return incomplete information in SC/CS configurations.
+
+ 2013-08-09 05:04 dimitr
+ M src/jrd/dfw.epp
+Fixed CORE-4173: Setting generator value twice in single transaction will set it to zero.
+
2013-08-08 08:41 hvlad
M src/jrd/cch.cpp
M src/jrd/cch.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-11 12:07:02 UTC (rev 58486)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-12 00:36:15 UTC (rev 58487)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30583
+ FORMAL BUILD NUMBER:30585
*/
-#define PRODUCT_VER_STRING "3.0.0.30583"
-#define FILE_VER_STRING "WI-T3.0.0.30583"
-#define LICENSE_VER_STRING "WI-T3.0.0.30583"
-#define FILE_VER_NUMBER 3, 0, 0, 30583
+#define PRODUCT_VER_STRING "3.0.0.30585"
+#define FILE_VER_STRING "WI-T3.0.0.30585"
+#define LICENSE_VER_STRING "WI-T3.0.0.30585"
+#define FILE_VER_NUMBER 3, 0, 0, 30585
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30583"
+#define FB_BUILD_NO "30585"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-11 12:07:02 UTC (rev 58486)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-12 00:36:15 UTC (rev 58487)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30583
+BuildNum=30585
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-14 00:41:08
|
Revision: 58489
http://sourceforge.net/p/firebird/code/58489
Author: firebirds
Date: 2013-08-14 00:41:05 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-12 02:20:12 UTC (rev 58488)
+++ firebird/trunk/ChangeLog 2013-08-14 00:41:05 UTC (rev 58489)
@@ -1,3 +1,7 @@
+ 2013-08-12 02:20 asfernandes
+ M src/dsql/parse.y
+Fixed CORE-4177 (only the simple test case reported in fb-devel) - Problem with some boolean expressions not being allowed.
+
2013-08-09 15:51 dimitr
M src/jrd/DatabaseSnapshot.cpp
Fixed CORE-4176: Monitoring tables return incomplete information in SC/CS configurations.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-12 02:20:12 UTC (rev 58488)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-14 00:41:05 UTC (rev 58489)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30585
+ FORMAL BUILD NUMBER:30586
*/
-#define PRODUCT_VER_STRING "3.0.0.30585"
-#define FILE_VER_STRING "WI-T3.0.0.30585"
-#define LICENSE_VER_STRING "WI-T3.0.0.30585"
-#define FILE_VER_NUMBER 3, 0, 0, 30585
+#define PRODUCT_VER_STRING "3.0.0.30586"
+#define FILE_VER_STRING "WI-T3.0.0.30586"
+#define LICENSE_VER_STRING "WI-T3.0.0.30586"
+#define FILE_VER_NUMBER 3, 0, 0, 30586
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30585"
+#define FB_BUILD_NO "30586"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-12 02:20:12 UTC (rev 58488)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-14 00:41:05 UTC (rev 58489)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30585
+BuildNum=30586
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-15 00:27:13
|
Revision: 58494
http://sourceforge.net/p/firebird/code/58494
Author: firebirds
Date: 2013-08-15 00:27:09 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-14 15:41:37 UTC (rev 58493)
+++ firebird/trunk/ChangeLog 2013-08-15 00:27:09 UTC (rev 58494)
@@ -1,3 +1,20 @@
+ 2013-08-14 15:41 asfernandes
+ M builds/posix/make.shared.targets
+Fixed the problem with make -j when only parse.y is changed.
+
+ 2013-08-14 09:27 dimitr
+ M src/jrd/validation.cpp
+Attempted to fix unexpectedly big (> 2^32) page numbers in the validation output + some related adjustments.
+
+ 2013-08-14 02:20 asfernandes
+ M src/dsql/Parser.h
+ M src/dsql/parse.y
+Fixed CORE-4177 (last part) - Problem with some boolean expressions not being allowed.
+
+ 2013-08-14 02:20 asfernandes
+ M src/jrd/recsrc/BufferedStream.cpp
+Fix assertion.
+
2013-08-12 02:20 asfernandes
M src/dsql/parse.y
Fixed CORE-4177 (only the simple test case reported in fb-devel) - Problem with some boolean expressions not being allowed.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-14 15:41:37 UTC (rev 58493)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-15 00:27:09 UTC (rev 58494)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30586
+ FORMAL BUILD NUMBER:30590
*/
-#define PRODUCT_VER_STRING "3.0.0.30586"
-#define FILE_VER_STRING "WI-T3.0.0.30586"
-#define LICENSE_VER_STRING "WI-T3.0.0.30586"
-#define FILE_VER_NUMBER 3, 0, 0, 30586
+#define PRODUCT_VER_STRING "3.0.0.30590"
+#define FILE_VER_STRING "WI-T3.0.0.30590"
+#define LICENSE_VER_STRING "WI-T3.0.0.30590"
+#define FILE_VER_NUMBER 3, 0, 0, 30590
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30586"
+#define FB_BUILD_NO "30590"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-14 15:41:37 UTC (rev 58493)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-15 00:27:09 UTC (rev 58494)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30586
+BuildNum=30590
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-16 00:27:31
|
Revision: 58497
http://sourceforge.net/p/firebird/code/58497
Author: firebirds
Date: 2013-08-16 00:27:27 +0000 (Fri, 16 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-15 15:42:57 UTC (rev 58496)
+++ firebird/trunk/ChangeLog 2013-08-16 00:27:27 UTC (rev 58497)
@@ -1,3 +1,11 @@
+ 2013-08-15 15:42 asfernandes
+ M src/dsql/metd.epp
+Fixed CORE-4180 - CREATE COLLATION does not verify base collation charset.
+
+ 2013-08-15 11:54 dimitr
+ M src/jrd/cch.cpp
+Fixed incorrect accounting re. number of fetches.
+
2013-08-14 15:41 asfernandes
M builds/posix/make.shared.targets
Fixed the problem with make -j when only parse.y is changed.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-15 15:42:57 UTC (rev 58496)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-16 00:27:27 UTC (rev 58497)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30590
+ FORMAL BUILD NUMBER:30592
*/
-#define PRODUCT_VER_STRING "3.0.0.30590"
-#define FILE_VER_STRING "WI-T3.0.0.30590"
-#define LICENSE_VER_STRING "WI-T3.0.0.30590"
-#define FILE_VER_NUMBER 3, 0, 0, 30590
+#define PRODUCT_VER_STRING "3.0.0.30592"
+#define FILE_VER_STRING "WI-T3.0.0.30592"
+#define LICENSE_VER_STRING "WI-T3.0.0.30592"
+#define FILE_VER_NUMBER 3, 0, 0, 30592
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30590"
+#define FB_BUILD_NO "30592"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-15 15:42:57 UTC (rev 58496)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-16 00:27:27 UTC (rev 58497)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30590
+BuildNum=30592
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-08-17 00:27:32
|
Revision: 58500
http://sourceforge.net/p/firebird/code/58500
Author: firebirds
Date: 2013-08-17 00:27:29 +0000 (Sat, 17 Aug 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-08-16 12:44:10 UTC (rev 58499)
+++ firebird/trunk/ChangeLog 2013-08-17 00:27:29 UTC (rev 58500)
@@ -1,3 +1,17 @@
+ 2013-08-16 12:44 alexpeshkoff
+ M src/common/classes/locks.h
+ M src/jrd/Attachment.h
+ M src/jrd/EngineInterface.h
+ M src/jrd/jrd.cpp
+ M src/jrd/tra.cpp
+ M src/yvalve/MasterImplementation.cpp
+Postfix for CORE-3935 & CORE-3944: helps avoid segfaults/deadlocks when shutting down firebird
+
+ 2013-08-16 12:41 alexpeshkoff
+ M src/jrd/lck.cpp
+ M src/jrd/lck.h
+Always lock dbb_sync before accessing something in setLockAttachment()
+
2013-08-15 15:42 asfernandes
M src/dsql/metd.epp
Fixed CORE-4180 - CREATE COLLATION does not verify base collation charset.
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-08-16 12:44:10 UTC (rev 58499)
+++ firebird/trunk/src/jrd/build_no.h 2013-08-17 00:27:29 UTC (rev 58500)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30592
+ FORMAL BUILD NUMBER:30594
*/
-#define PRODUCT_VER_STRING "3.0.0.30592"
-#define FILE_VER_STRING "WI-T3.0.0.30592"
-#define LICENSE_VER_STRING "WI-T3.0.0.30592"
-#define FILE_VER_NUMBER 3, 0, 0, 30592
+#define PRODUCT_VER_STRING "3.0.0.30594"
+#define FILE_VER_STRING "WI-T3.0.0.30594"
+#define LICENSE_VER_STRING "WI-T3.0.0.30594"
+#define FILE_VER_NUMBER 3, 0, 0, 30594
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30592"
+#define FB_BUILD_NO "30594"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-08-16 12:44:10 UTC (rev 58499)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-08-17 00:27:29 UTC (rev 58500)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30592
+BuildNum=30594
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X