Merge remote branch 'origin/master' into br_regstats
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0b869345 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0b869345 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0b869345 Branch: refs/heads/master Commit: 0b8693459d37367a674dcafe96ad3eca65b3c353 Parents: 5169864 f8856eb Author: Cloud User <[email protected]> Authored: Wed Nov 25 20:29:22 2015 +0000 Committer: Cloud User <[email protected]> Committed: Wed Nov 25 20:29:22 2015 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/gensq.pl | 20 +++- core/sqf/sql/scripts/lobstart | 4 +- core/sqf/sql/scripts/makemsg.ksh | 2 +- core/sql/ustat/hs_cli.cpp | 4 +- core/sql/ustat/hs_cli.h | 2 +- core/sql/ustat/hs_globals.cpp | 128 ++----------------------- core/sql/ustat/hs_globals.h | 2 - core/sql/ustat/hs_la.h | 6 +- core/sql/ustat/hs_parser.cpp | 1 - win-odbc64/odbcclient/drvr35/cconnect.cpp | 8 +- 10 files changed, 37 insertions(+), 140 deletions(-) ----------------------------------------------------------------------
