merge jack-akiban: Fix for bug 893804
merge jack-akiban: Fix for bug 893804

https://code.launchpad.net/~jack-akiban/akiban-server/20111128_bug_893804/+merge/83637
jaytaylor/sql-layer,jaytaylor/sql-layer,wfxiang08/sql-layer-1,qiuyesuifeng/sql-layer,shunwang/sql-layer-1,shunwang/sql-layer-1,ngaut/sql-layer,wfxiang08/sql-layer-1,qiuyesuifeng/sql-layer,relateiq/sql-layer,qiuyesuifeng/sql-layer,relateiq/sql-layer,wfxiang08/sql-layer-1,ngaut/sql-layer,shunwang/sql-layer-1,relateiq/sql-layer,wfxiang08/sql-layer-1,ngaut/sql-layer,jaytaylor/sql-layer,relateiq/sql-layer,shunwang/sql-layer-1,jaytaylor/sql-layer,qiuyesuifeng/sql-layer,ngaut/sql-layer