summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <serg@infomag.ape.relarn.ru>2000-08-22 12:33:46 +0400
committerunknown <serg@infomag.ape.relarn.ru>2000-08-22 12:33:46 +0400
commit69bb38752c8ce269ae6083ec125606125239b446 (patch)
tree91aa0d4dd34e45615cb1312de6fa0eacf4bd43ff /sql/share
parent35adc31916da6d6c6086b74cc364645d4fd3a400 (diff)
parentafbecb2979cb4be37d7bcf293ddfd2dae16171fe (diff)
downloadmariadb-git-69bb38752c8ce269ae6083ec125606125239b446.tar.gz
Merge
configure.in: Merged Docs/manual.texi: Merged
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/swedish/errmsg.OLD1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/share/swedish/errmsg.OLD b/sql/share/swedish/errmsg.OLD
index 94055083e54..233a60a5221 100644
--- a/sql/share/swedish/errmsg.OLD
+++ b/sql/share/swedish/errmsg.OLD
@@ -193,5 +193,4 @@
"Fick nätverksfel vid läsning från master",
"Fick nätverksfel vid skrivning till master",
"Hittar inte ett FULLTEXT index i kolumnlist",
-#ER_LOCK_OR_ACTIVE_TRANSACTION
"Can't execute the given command because you have active locked tables or an active transaction",