summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-02-14 21:50:09 +0100
committerserg@serg.mylan <>2005-02-14 21:50:09 +0100
commitfd828e5b4d7f20a64bccfc25a096ca94760bcec9 (patch)
treeea9dd08a255018554104b4f137dea7cfe36ece0a /libmysqld
parent2b49bea59a594a0f4a87200adca21fb0cc3b2893 (diff)
parentdb13afd89db4a415e2a77b0c200a1391ea2f03fe (diff)
downloadmariadb-git-fd828e5b4d7f20a64bccfc25a096ca94760bcec9.tar.gz
manually merged
Diffstat (limited to 'libmysqld')
-rw-r--r--[-rwxr-xr-x]libmysqld/libmysqld.rc0
-rw-r--r--[-rwxr-xr-x]libmysqld/resource.h0
2 files changed, 0 insertions, 0 deletions
diff --git a/libmysqld/libmysqld.rc b/libmysqld/libmysqld.rc
index 5b6142faddf..5b6142faddf 100755..100644
--- a/libmysqld/libmysqld.rc
+++ b/libmysqld/libmysqld.rc
diff --git a/libmysqld/resource.h b/libmysqld/resource.h
index f770fe490a6..f770fe490a6 100755..100644
--- a/libmysqld/resource.h
+++ b/libmysqld/resource.h