Minor changes.

git-svn-id: svn://svn.zabbix.com/trunk@3428 97f52cf1-0a1b-0410-bd0e-c28be96e8082

3 files changed, 1 insertions, 411 deletions

diff --git a/create/schema/schema_new.sql b/create/schema/schema_new.sql
index a389797d..77978fac 100644
--- a/create/schema/schema_new.sql
+++ b/create/schema/schema_new.sql
@@ -493,7 +493,7 @@ FIELD		|hostid		|t_id		|'0'	|NOT NULL	|
 FIELD		|devicetype	|t_varchar(64)	|''	|NOT NULL	|
 FIELD		|name		|t_varchar(64)	|''	|NOT NULL	|
 FIELD		|os		|t_varchar(64)	|''	|NOT NULL	|
-FIELD		|t_serialno	|t_varchar(64)	|''	|NOT NULL	|
+FIELD		|serialno	|t_varchar(64)	|''	|NOT NULL	|
 FIELD		|tag		|t_varchar(64)	|''	|NOT NULL	|
 FIELD		|macaddress	|t_varchar(64)	|''	|NOT NULL	|
 FIELD		|hardware	|t_blob		|''	|NOT NULL	|
diff --git a/include/dbsync.h b/include/dbsync.h
index 121bfb24..d9ff1871 100644
--- a/include/dbsync.h
+++ b/include/dbsync.h
@@ -499,9 +499,6 @@ static	ZBX_TABLE	tables[]={
 		{"hosttemplateid",	ZBX_TYPE_INT,	ZBX_SYNC},
 		{"hostid",		ZBX_TYPE_INT,	ZBX_SYNC},
 		{"templateid",		ZBX_TYPE_INT,	ZBX_SYNC},
-		{"items",		ZBX_TYPE_INT,	ZBX_SYNC},
-		{"triggers",		ZBX_TYPE_INT,	ZBX_SYNC},
-		{"graphs",		ZBX_TYPE_INT,	ZBX_SYNC},
 		{0}
 		}
 	},
diff --git a/src/zabbix_server/nodewatcher/.deps/nodewatcher.Po b/src/zabbix_server/nodewatcher/.deps/nodewatcher.Po
deleted file mode 100644
index dcc70e06..00000000
--- a/src/zabbix_server/nodewatcher/.deps/nodewatcher.Po
+++ /dev/null
@@ -1,407 +0,0 @@
-nodewatcher.o nodewatcher.o: nodewatcher.c ../../../include/config.h \
-  /usr/include/stdio.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/gnu/stubs.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.3/include/stddef.h \
-  /usr/include/bits/types.h /usr/include/bits/wordsize.h \
-  /usr/include/bits/typesizes.h /usr/include/libio.h \
-  /usr/include/_G_config.h /usr/include/wchar.h /usr/include/bits/wchar.h \
-  /usr/include/gconv.h /usr/lib/gcc/i486-linux-gnu/4.0.3/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
-  /usr/include/endian.h /usr/include/bits/endian.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h /usr/include/bits/time.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/bits/sched.h /usr/include/alloca.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h /usr/include/sys/stat.h /usr/include/bits/stat.h \
-  /usr/include/sys/socket.h /usr/include/sys/uio.h \
-  /usr/include/bits/uio.h /usr/include/bits/socket.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.3/include/limits.h \
-  /usr/lib/gcc/i486-linux-gnu/4.0.3/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h /usr/include/bits/sockaddr.h \
-  /usr/include/asm/socket.h /usr/include/asm-i386/socket.h \
-  /usr/include/asm/sockios.h /usr/include/asm-i386/sockios.h \
-  /usr/include/netinet/in.h /usr/include/stdint.h /usr/include/bits/in.h \
-  /usr/include/bits/byteswap.h /usr/include/sys/wait.h \
-  /usr/include/signal.h /usr/include/bits/signum.h \
-  /usr/include/bits/siginfo.h /usr/include/bits/sigaction.h \
-  /usr/include/bits/sigcontext.h /usr/include/asm/sigcontext.h \
-  /usr/include/asm-i386/sigcontext.h /usr/include/bits/sigstack.h \
-  /usr/include/bits/sigthread.h /usr/include/sys/resource.h \
-  /usr/include/bits/resource.h /usr/include/bits/waitflags.h \
-  /usr/include/bits/waitstatus.h /usr/include/string.h \
-  /usr/include/netdb.h /usr/include/rpc/netdb.h /usr/include/bits/netdb.h \
-  /usr/include/pwd.h /usr/include/errno.h /usr/include/bits/errno.h \
-  /usr/include/linux/errno.h /usr/include/asm/errno.h \
-  /usr/include/asm-i386/errno.h ../../../include/common.h \
-  ../../../include/sysinc.h ../../../include/config.h \
-  /usr/include/assert.h /usr/include/ctype.h /usr/include/strings.h \
-  /usr/include/sys/time.h /usr/include/linux/kernel.h \
-  /usr/include/arpa/nameser.h /usr/include/sys/param.h \
-  /usr/include/linux/param.h /usr/include/asm/param.h \
-  /usr/include/asm-i386/param.h /usr/include/sys/bitypes.h \
-  /usr/include/arpa/nameser_compat.h /usr/include/dirent.h \
-  /usr/include/bits/dirent.h /usr/include/fcntl.h \
-  /usr/include/bits/fcntl.h /usr/include/sys/procfs.h \
-  /usr/include/sys/user.h /usr/include/pthread.h /usr/include/sched.h \
-  /usr/include/bits/initspin.h /usr/include/resolv.h \
-  /usr/include/sys/statvfs.h /usr/include/bits/statvfs.h \
-  /usr/include/sys/swap.h /usr/include/sys/syscall.h \
-  /usr/include/asm/unistd.h /usr/include/asm-i386/unistd.h \
-  /usr/include/bits/syscall.h /usr/include/sys/sysctl.h \
-  /usr/include/linux/sysctl.h /usr/include/linux/types.h \
-  /usr/include/sys/sysinfo.h /usr/include/sys/vfs.h \
-  /usr/include/sys/statfs.h /usr/include/bits/statfs.h \
-  /usr/include/net/if.h /usr/include/syslog.h /usr/include/sys/syslog.h \
-  /usr/include/sys/ipc.h /usr/include/bits/ipctypes.h \
-  /usr/include/bits/ipc.h /usr/include/sys/sem.h /usr/include/bits/sem.h \
-  /usr/include/sys/shm.h /usr/include/bits/shm.h /usr/include/math.h \
-  /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \
-  /usr/include/bits/mathcalls.h /usr/include/regex.h \
-  /usr/include/arpa/inet.h /usr/include/sys/mount.h \
-  /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \
-  /usr/include/asm/ioctls.h /usr/include/asm-i386/ioctls.h \
-  /usr/include/asm/ioctl.h /usr/include/asm-i386/ioctl.h \
-  /usr/include/bits/ioctl-types.h /usr/include/sys/ttydefaults.h \
-  /usr/include/sys/timeb.h ../../../include/zbxtypes.h \
-  ../../../include/cfg.h ../../../include/db.h ../../../include/common.h \
-  /usr/include/mysql/mysql.h /usr/include/mysql/mysql_com.h \
-  /usr/include/mysql/mysql_time.h /usr/include/mysql/mysql_version.h \
-  /usr/include/mysql/typelib.h /usr/include/mysql/my_list.h \
-  /usr/include/mysql/my_alloc.h /usr/include/mysql/errmsg.h \
-  /usr/include/mysql/mysqld_error.h ../../../include/log.h \
-  ../../../include/zlog.h ../../../include/dbsync.h events.h history.h \
-  nodewatcher.h nodesender.h
-
-../../../include/config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.0.3/include/stddef.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/wchar.h:
-
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.0.3/include/stdarg.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/time.h:
-
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/sys/sysmacros.h:
-
-/usr/include/bits/pthreadtypes.h:
-
-/usr/include/bits/sched.h:
-
-/usr/include/alloca.h:
-
-/usr/include/unistd.h:
-
-/usr/include/bits/posix_opt.h:
-
-/usr/include/bits/confname.h:
-
-/usr/include/getopt.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/bits/stat.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/sys/uio.h:
-
-/usr/include/bits/uio.h:
-
-/usr/include/bits/socket.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.0.3/include/limits.h:
-
-/usr/lib/gcc/i486-linux-gnu/4.0.3/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/include/bits/sockaddr.h:
-
-/usr/include/asm/socket.h:
-
-/usr/include/asm-i386/socket.h:
-
-/usr/include/asm/sockios.h:
-
-/usr/include/asm-i386/sockios.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/stdint.h:
-
-/usr/include/bits/in.h:
-
-/usr/include/bits/byteswap.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/signal.h:
-
-/usr/include/bits/signum.h:
-
-/usr/include/bits/siginfo.h:
-
-/usr/include/bits/sigaction.h:
-
-/usr/include/bits/sigcontext.h:
-
-/usr/include/asm/sigcontext.h:
-
-/usr/include/asm-i386/sigcontext.h:
-
-/usr/include/bits/sigstack.h:
-
-/usr/include/bits/sigthread.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/bits/resource.h:
-
-/usr/include/bits/waitflags.h:
-
-/usr/include/bits/waitstatus.h:
-
-/usr/include/string.h:
-
-/usr/include/netdb.h:
-
-/usr/include/rpc/netdb.h:
-
-/usr/include/bits/netdb.h:
-
-/usr/include/pwd.h:
-
-/usr/include/errno.h:
-
-/usr/include/bits/errno.h:
-
-/usr/include/linux/errno.h:
-
-/usr/include/asm/errno.h:
-
-/usr/include/asm-i386/errno.h:
-
-../../../include/common.h:
-
-../../../include/sysinc.h:
-
-../../../include/config.h:
-
-/usr/include/assert.h:
-
-/usr/include/ctype.h:
-
-/usr/include/strings.h:
-
-/usr/include/sys/time.h:
-
-/usr/include/linux/kernel.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/linux/param.h:
-
-/usr/include/asm/param.h:
-
-/usr/include/asm-i386/param.h:
-
-/usr/include/sys/bitypes.h:
-
-/usr/include/arpa/nameser_compat.h:
-
-/usr/include/dirent.h:
-
-/usr/include/bits/dirent.h:
-
-/usr/include/fcntl.h:
-
-/usr/include/bits/fcntl.h:
-
-/usr/include/sys/procfs.h:
-
-/usr/include/sys/user.h:
-
-/usr/include/pthread.h:
-
-/usr/include/sched.h:
-
-/usr/include/bits/initspin.h:
-
-/usr/include/resolv.h:
-
-/usr/include/sys/statvfs.h:
-
-/usr/include/bits/statvfs.h:
-
-/usr/include/sys/swap.h:
-
-/usr/include/sys/syscall.h:
-
-/usr/include/asm/unistd.h:
-
-/usr/include/asm-i386/unistd.h:
-
-/usr/include/bits/syscall.h:
-
-/usr/include/sys/sysctl.h:
-
-/usr/include/linux/sysctl.h:
-
-/usr/include/linux/types.h:
-
-/usr/include/sys/sysinfo.h:
-
-/usr/include/sys/vfs.h:
-
-/usr/include/sys/statfs.h:
-
-/usr/include/bits/statfs.h:
-
-/usr/include/net/if.h:
-
-/usr/include/syslog.h:
-
-/usr/include/sys/syslog.h:
-
-/usr/include/sys/ipc.h:
-
-/usr/include/bits/ipctypes.h:
-
-/usr/include/bits/ipc.h:
-
-/usr/include/sys/sem.h:
-
-/usr/include/bits/sem.h:
-
-/usr/include/sys/shm.h:
-
-/usr/include/bits/shm.h:
-
-/usr/include/math.h:
-
-/usr/include/bits/huge_val.h:
-
-/usr/include/bits/mathdef.h:
-
-/usr/include/bits/mathcalls.h:
-
-/usr/include/regex.h:
-
-/usr/include/arpa/inet.h:
-
-/usr/include/sys/mount.h:
-
-/usr/include/sys/ioctl.h:
-
-/usr/include/bits/ioctls.h:
-
-/usr/include/asm/ioctls.h:
-
-/usr/include/asm-i386/ioctls.h:
-
-/usr/include/asm/ioctl.h:
-
-/usr/include/asm-i386/ioctl.h:
-
-/usr/include/bits/ioctl-types.h:
-
-/usr/include/sys/ttydefaults.h:
-
-/usr/include/sys/timeb.h:
-
-../../../include/zbxtypes.h:
-
-../../../include/cfg.h:
-
-../../../include/db.h:
-
-../../../include/common.h:
-
-/usr/include/mysql/mysql.h:
-
-/usr/include/mysql/mysql_com.h:
-
-/usr/include/mysql/mysql_time.h:
-
-/usr/include/mysql/mysql_version.h:
-
-/usr/include/mysql/typelib.h:
-
-/usr/include/mysql/my_list.h:
-
-/usr/include/mysql/my_alloc.h:
-
-/usr/include/mysql/errmsg.h:
-
-/usr/include/mysql/mysqld_error.h:
-
-../../../include/log.h:
-
-../../../include/zlog.h:
-
-../../../include/dbsync.h:
-
-events.h:
-
-history.h:
-
-nodewatcher.h:
-
-nodesender.h: