summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-02-17 14:00:44 +0100
committerserg@serg.mylan <>2005-02-17 14:00:44 +0100
commit530eecbd99c7157917ca95b80e002e32d1d6e50e (patch)
tree2286825455d6ff56f96a8bcd52bbb6737ebcd354 /libmysqld
parentf795c787cd66e3c94f6d3461a93658359c6a7ac4 (diff)
parent2b41b8fa0187c80c135e346a262b0472cd295889 (diff)
downloadmariadb-git-530eecbd99c7157917ca95b80e002e32d1d6e50e.tar.gz
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
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