summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-05-25 16:26:52 -0600
committerunknown <sasha@mysql.sashanet.com>2001-05-25 16:26:52 -0600
commit714640bfb9f725f05567c58fac34612e3e99df33 (patch)
treeddf1988dea52361874185c7bf3258eace91fd517
parentf2c0436616634fc55613114a65e38eec1bfcc010 (diff)
downloadmariadb-git-714640bfb9f725f05567c58fac34612e3e99df33.tar.gz
BUILD/SETUP.sh@1.9
removed -ffixed-ebp from reckless flags BUILD/compile-pentium@1.16 use fast, not reckless flags for binary distribuition sql/share/english/errmsg.txt@1.24 Point the user to the manual when he gets aborted connection message BUILD/SETUP.sh: removed -ffixed-ebp from reckless flags BUILD/compile-pentium: use fast, not reckless flags for binary distribuition sql/share/english/errmsg.txt: Point the user to the manual when he gets aborted connection message BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-rw-r--r--BUILD/SETUP.sh5
-rwxr-xr-xBUILD/compile-pentium2
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--sql/share/english/errmsg.txt4
4 files changed, 8 insertions, 4 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index 1f45c5c18cb..778625e9e75 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -43,8 +43,11 @@ alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
pentium_cflags="-mpentiumpro"
sparc_cflags=""
+# be as fast as we can be without losing our ability to backtrace
fast_cflags="-O3 -fno-omit-frame-pointer"
-reckless_cflags="-O3 -fomit-frame-pointer -ffixed-ebp"
+# this is one is for someone who thinks 1% speedup is worth not being
+# able to backtrace
+reckless_cflags="-O3 -fomit-frame-pointer "
debug_cflags="-DEXTRA_DEBUG -DFORCE_INIT_OF_VARS -DSAFEMALLOC -DSAFE_MUTEX -O2"
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
diff --git a/BUILD/compile-pentium b/BUILD/compile-pentium
index 9607ca03e7e..11559be93de 100755
--- a/BUILD/compile-pentium
+++ b/BUILD/compile-pentium
@@ -3,7 +3,7 @@
path=`dirname $0`
. "$path/SETUP.sh"
-extra_flags="$pentium_cflags $reckless_cflags"
+extra_flags="$pentium_cflags $fast_cflags"
extra_configs="$pentium_configs"
strip=yes
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 8bf83e5a369..2bd9389d2d3 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1 +1,2 @@
mwagner@evoq.mwagner.org
+sasha@mysql.sashanet.com
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index ff29fffe958..4deffcd16be 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -153,7 +153,7 @@
"You have an error in your SQL syntax",
"Delayed insert thread couldn't get requested lock for table %-.64s",
"Too many delayed threads in use",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s)",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' (%-.64s) - see http://www.mysql.com/doc/C/o/Communication_errors.html",
"Got a packet bigger than 'max_allowed_packet'",
"Got a read error from the connection pipe",
"Got an error from fcntl()",
@@ -185,7 +185,7 @@
"Got error %d during ROLLBACK",
"Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT",
-"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
+"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s) see http://www.mysql.com/doc/C/o/Communication_errors.html",
"The handler for the table does not support binary table dump",
"Binlog closed, cannot RESET MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",