From 1e4cdb813feab70b19487e1793eb51b87bc3bf7c Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Tue, 8 Sep 2015 19:25:50 +0800 Subject: [PATCH 1/2] *: update QL-LICENSE and STRUTIL-LICENSE. --- LICENSE.md => LICENSES/LICENSE | 0 docs/ql-license => LICENSES/QL-LICENSE | 2 +- LICENSES/STRUTIL-LICENSE | 27 +++++++++++++++++++++++ column/column.go | 2 +- ddl/ddl.go | 2 +- driver.go | 2 +- expression/expression.go | 2 +- expression/expressions/between.go | 2 +- expression/expressions/binop.go | 2 +- expression/expressions/builtin.go | 2 +- expression/expressions/builtin_groupby.go | 2 +- expression/expressions/builtin_math.go | 2 +- expression/expressions/builtin_string.go | 2 +- expression/expressions/builtin_time.go | 2 +- expression/expressions/call.go | 2 +- expression/expressions/helper.go | 2 +- expression/expressions/ident.go | 2 +- expression/expressions/in.go | 2 +- expression/expressions/like.go | 2 +- expression/expressions/pexpr.go | 2 +- expression/expressions/regexp.go | 2 +- expression/expressions/unary.go | 2 +- expression/expressions/value.go | 2 +- field/field.go | 2 +- field/result_field.go | 2 +- kv/memkv/btree.go | 2 +- kv/memkv/temp.go | 2 +- parser/parser.y | 2 +- parser/scanner.l | 2 +- plan/plan.go | 2 +- plan/plans/distinct.go | 2 +- plan/plans/explain.go | 2 +- plan/plans/fields.go | 2 +- plan/plans/from.go | 2 +- plan/plans/groupby.go | 2 +- plan/plans/join.go | 2 +- plan/plans/limit.go | 2 +- plan/plans/orderby.go | 2 +- plan/plans/plans.go | 2 +- plan/plans/where.go | 2 +- rset/rset.go | 2 +- rset/rsets/distinct.go | 2 +- rset/rsets/fields.go | 2 +- rset/rsets/from.go | 2 +- rset/rsets/groupby.go | 2 +- rset/rsets/join.go | 2 +- rset/rsets/limit.go | 2 +- rset/rsets/orderby.go | 2 +- rset/rsets/rsets.go | 2 +- rset/rsets/where.go | 2 +- session.go | 2 +- stmt/stmt.go | 2 +- stmt/stmts/altertable.go | 2 +- stmt/stmts/create.go | 2 +- stmt/stmts/delete.go | 2 +- stmt/stmts/drop.go | 2 +- stmt/stmts/explain.go | 2 +- stmt/stmts/insert.go | 2 +- stmt/stmts/select.go | 2 +- stmt/stmts/transaction.go | 2 +- stmt/stmts/truncate.go | 2 +- stmt/stmts/update.go | 2 +- stmt/stmts/use.go | 2 +- table/table.go | 2 +- table/tables/tables.go | 2 +- tidb.go | 2 +- util/format/format.go | 4 ++-- util/prefix_helper.go | 2 +- util/types/compare.go | 2 +- util/types/convert.go | 2 +- util/types/etc.go | 2 +- util/types/field_type.go | 2 +- 72 files changed, 98 insertions(+), 71 deletions(-) rename LICENSE.md => LICENSES/LICENSE (100%) rename docs/ql-license => LICENSES/QL-LICENSE (99%) create mode 100644 LICENSES/STRUTIL-LICENSE diff --git a/LICENSE.md b/LICENSES/LICENSE similarity index 100% rename from LICENSE.md rename to LICENSES/LICENSE diff --git a/docs/ql-license b/LICENSES/QL-LICENSE similarity index 99% rename from docs/ql-license rename to LICENSES/QL-LICENSE index 0d10c02b92ef7..c11db180365f3 100644 --- a/docs/ql-license +++ b/LICENSES/QL-LICENSE @@ -24,4 +24,4 @@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/LICENSES/STRUTIL-LICENSE b/LICENSES/STRUTIL-LICENSE new file mode 100644 index 0000000000000..28713a467a43e --- /dev/null +++ b/LICENSES/STRUTIL-LICENSE @@ -0,0 +1,27 @@ +Copyright (c) 2014 The strutil Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the names of the authors nor the names of the +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/column/column.go b/column/column.go index 97a996f7d55ce..9495fdb60e8b9 100644 --- a/column/column.go +++ b/column/column.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/ddl/ddl.go b/ddl/ddl.go index ed10f45d0d664..3def01cedcade 100644 --- a/ddl/ddl.go +++ b/ddl/ddl.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/driver.go b/driver.go index 2f0959bfae8c4..b32fc5f81b8fa 100644 --- a/driver.go +++ b/driver.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expression.go b/expression/expression.go index c968f9584e7b2..11644bc385ada 100644 --- a/expression/expression.go +++ b/expression/expression.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/between.go b/expression/expressions/between.go index f82ea851f066a..f13c145b235cf 100644 --- a/expression/expressions/between.go +++ b/expression/expressions/between.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/binop.go b/expression/expressions/binop.go index 5845d7b8354c8..6a8e115130335 100644 --- a/expression/expressions/binop.go +++ b/expression/expressions/binop.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/builtin.go b/expression/expressions/builtin.go index 18c79aebc758b..b979a1afa67e9 100644 --- a/expression/expressions/builtin.go +++ b/expression/expressions/builtin.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/builtin_groupby.go b/expression/expressions/builtin_groupby.go index c6d2d968199ec..c7a5240f47914 100644 --- a/expression/expressions/builtin_groupby.go +++ b/expression/expressions/builtin_groupby.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/builtin_math.go b/expression/expressions/builtin_math.go index f3ad79f468cdb..3bc1cde28f7a4 100644 --- a/expression/expressions/builtin_math.go +++ b/expression/expressions/builtin_math.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/builtin_string.go b/expression/expressions/builtin_string.go index 6b6c97c63d7bf..3248d9529f75c 100644 --- a/expression/expressions/builtin_string.go +++ b/expression/expressions/builtin_string.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/builtin_time.go b/expression/expressions/builtin_time.go index 99b50401a6f9a..a388d5e730168 100644 --- a/expression/expressions/builtin_time.go +++ b/expression/expressions/builtin_time.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/call.go b/expression/expressions/call.go index 7c3b8a51624b0..db5b5387135ca 100644 --- a/expression/expressions/call.go +++ b/expression/expressions/call.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/helper.go b/expression/expressions/helper.go index 8ac583cd455a9..f4b162ea9e8e1 100644 --- a/expression/expressions/helper.go +++ b/expression/expressions/helper.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/ident.go b/expression/expressions/ident.go index a8a7bb2d50562..54d67ff0dd61e 100644 --- a/expression/expressions/ident.go +++ b/expression/expressions/ident.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/in.go b/expression/expressions/in.go index 599131c4754a1..ecd0c9f56efad 100644 --- a/expression/expressions/in.go +++ b/expression/expressions/in.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/like.go b/expression/expressions/like.go index cbabdcb8a060c..4f7ce4dcc985b 100644 --- a/expression/expressions/like.go +++ b/expression/expressions/like.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/pexpr.go b/expression/expressions/pexpr.go index 2c1ca9b4fbe56..b61b154abdc48 100644 --- a/expression/expressions/pexpr.go +++ b/expression/expressions/pexpr.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/regexp.go b/expression/expressions/regexp.go index 0b65005cd1f9b..a107d9d84d397 100644 --- a/expression/expressions/regexp.go +++ b/expression/expressions/regexp.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/unary.go b/expression/expressions/unary.go index c6263dc5b58d9..182b08e30f2f4 100644 --- a/expression/expressions/unary.go +++ b/expression/expressions/unary.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/expression/expressions/value.go b/expression/expressions/value.go index 683018dd49a15..83d100144fd5a 100644 --- a/expression/expressions/value.go +++ b/expression/expressions/value.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/field/field.go b/field/field.go index 302448968e0d5..059cf86e44cab 100644 --- a/field/field.go +++ b/field/field.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/field/result_field.go b/field/result_field.go index d8a9958454c59..6fb5633ef4656 100644 --- a/field/result_field.go +++ b/field/result_field.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/kv/memkv/btree.go b/kv/memkv/btree.go index 91e8a8f1522e8..34e249162b946 100644 --- a/kv/memkv/btree.go +++ b/kv/memkv/btree.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/kv/memkv/temp.go b/kv/memkv/temp.go index 397ba67cc0229..01e9d43d059a9 100644 --- a/kv/memkv/temp.go +++ b/kv/memkv/temp.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/parser/parser.y b/parser/parser.y index a1712006ac085..cd80e9ac09101 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -1,7 +1,7 @@ %{ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/parser/scanner.l b/parser/scanner.l index d3ea5704dc580..c77d3d97a1766 100644 --- a/parser/scanner.l +++ b/parser/scanner.l @@ -1,7 +1,7 @@ %{ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plan.go b/plan/plan.go index 4602c3dadb716..72600d5d9e4ac 100644 --- a/plan/plan.go +++ b/plan/plan.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/distinct.go b/plan/plans/distinct.go index 59a892fc83ccb..4d3c814fea4c6 100644 --- a/plan/plans/distinct.go +++ b/plan/plans/distinct.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/explain.go b/plan/plans/explain.go index 6a0f0231db49c..06d907e76b0ec 100644 --- a/plan/plans/explain.go +++ b/plan/plans/explain.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/fields.go b/plan/plans/fields.go index 17e5641b3ed17..ecebad41a19fd 100644 --- a/plan/plans/fields.go +++ b/plan/plans/fields.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/from.go b/plan/plans/from.go index bdee50570a546..1d20753754166 100644 --- a/plan/plans/from.go +++ b/plan/plans/from.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/groupby.go b/plan/plans/groupby.go index b6356e0654c7d..401bc100ce689 100644 --- a/plan/plans/groupby.go +++ b/plan/plans/groupby.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/join.go b/plan/plans/join.go index 66fee44463e5b..106b0c049674c 100644 --- a/plan/plans/join.go +++ b/plan/plans/join.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/limit.go b/plan/plans/limit.go index 834587490ac16..ac65e2690725e 100644 --- a/plan/plans/limit.go +++ b/plan/plans/limit.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/orderby.go b/plan/plans/orderby.go index a97c92f575902..77a32790942ab 100644 --- a/plan/plans/orderby.go +++ b/plan/plans/orderby.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/plans.go b/plan/plans/plans.go index ab1ace147d171..6c6d36af84a8c 100644 --- a/plan/plans/plans.go +++ b/plan/plans/plans.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/plan/plans/where.go b/plan/plans/where.go index 1ba2cad4c21f0..01005a7eaf19d 100644 --- a/plan/plans/where.go +++ b/plan/plans/where.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rset.go b/rset/rset.go index 1f10b7cbc5509..f5dc283bd20d5 100644 --- a/rset/rset.go +++ b/rset/rset.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/distinct.go b/rset/rsets/distinct.go index 51e1b37684cc5..4ea5b8efd8d51 100644 --- a/rset/rsets/distinct.go +++ b/rset/rsets/distinct.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/fields.go b/rset/rsets/fields.go index 76dcc53714ff8..bebadb6369235 100644 --- a/rset/rsets/fields.go +++ b/rset/rsets/fields.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/from.go b/rset/rsets/from.go index 7305e68b3afdf..337cdc1617d7f 100644 --- a/rset/rsets/from.go +++ b/rset/rsets/from.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/groupby.go b/rset/rsets/groupby.go index 2bc17d8942881..e854bdcf1aad5 100644 --- a/rset/rsets/groupby.go +++ b/rset/rsets/groupby.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/join.go b/rset/rsets/join.go index d342d3b9907af..3d38f294e1103 100644 --- a/rset/rsets/join.go +++ b/rset/rsets/join.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/limit.go b/rset/rsets/limit.go index 2de34b3e71636..9585db395840a 100644 --- a/rset/rsets/limit.go +++ b/rset/rsets/limit.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/orderby.go b/rset/rsets/orderby.go index 12c97c0b5dcbf..22b2cadef1c3a 100644 --- a/rset/rsets/orderby.go +++ b/rset/rsets/orderby.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/rsets.go b/rset/rsets/rsets.go index 74068ee09b4a6..bba5e95e5341e 100644 --- a/rset/rsets/rsets.go +++ b/rset/rsets/rsets.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/rset/rsets/where.go b/rset/rsets/where.go index 68381a5c37838..9ef0e067f15ff 100644 --- a/rset/rsets/where.go +++ b/rset/rsets/where.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/session.go b/session.go index 7411b908c8a3c..b22546357fc23 100644 --- a/session.go +++ b/session.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmt.go b/stmt/stmt.go index 5d3747f60c298..3c3dc60354ad5 100644 --- a/stmt/stmt.go +++ b/stmt/stmt.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/altertable.go b/stmt/stmts/altertable.go index c9af204cfb496..2c014cd2f6276 100644 --- a/stmt/stmts/altertable.go +++ b/stmt/stmts/altertable.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/create.go b/stmt/stmts/create.go index cd0c3855f845f..1dcfa5d59ad83 100644 --- a/stmt/stmts/create.go +++ b/stmt/stmts/create.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/delete.go b/stmt/stmts/delete.go index f4b09b46e4d1e..b92c493802726 100644 --- a/stmt/stmts/delete.go +++ b/stmt/stmts/delete.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/drop.go b/stmt/stmts/drop.go index ed916286447ad..8f7b685e25c86 100644 --- a/stmt/stmts/drop.go +++ b/stmt/stmts/drop.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/explain.go b/stmt/stmts/explain.go index de7a4e007ada0..57fd35d2cbda9 100644 --- a/stmt/stmts/explain.go +++ b/stmt/stmts/explain.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/insert.go b/stmt/stmts/insert.go index 5999856f3c1fb..f75f71e7a7136 100644 --- a/stmt/stmts/insert.go +++ b/stmt/stmts/insert.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/select.go b/stmt/stmts/select.go index 1354e80a720f2..7d11d219ac6d1 100644 --- a/stmt/stmts/select.go +++ b/stmt/stmts/select.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/transaction.go b/stmt/stmts/transaction.go index 36be518fd526b..2b5c8e7a1c139 100644 --- a/stmt/stmts/transaction.go +++ b/stmt/stmts/transaction.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/truncate.go b/stmt/stmts/truncate.go index 0a8a7f51709d4..53da478e5a44f 100644 --- a/stmt/stmts/truncate.go +++ b/stmt/stmts/truncate.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/update.go b/stmt/stmts/update.go index 9105444af9867..0e8b6c259d121 100644 --- a/stmt/stmts/update.go +++ b/stmt/stmts/update.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/stmt/stmts/use.go b/stmt/stmts/use.go index c35b38d14f9dc..1d91e076ea9f7 100644 --- a/stmt/stmts/use.go +++ b/stmt/stmts/use.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/table/table.go b/table/table.go index 8aa41eca81246..7270c82f904d0 100644 --- a/table/table.go +++ b/table/table.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/table/tables/tables.go b/table/tables/tables.go index d0d0c8f280e5d..0e525d567c8f5 100644 --- a/table/tables/tables.go +++ b/table/tables/tables.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/tidb.go b/tidb.go index 5b0e2e282094a..b6542b9c1a39f 100644 --- a/tidb.go +++ b/tidb.go @@ -1,6 +1,6 @@ // Copyright 2013 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/util/format/format.go b/util/format/format.go index 67dd23bba6b3f..d96f51399895c 100644 --- a/util/format/format.go +++ b/util/format/format.go @@ -1,6 +1,6 @@ -// Copyright 2014 The ql Authors. All rights reserved. +// Copyright (c) 2014 The sortutil Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/STRUTIL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/util/prefix_helper.go b/util/prefix_helper.go index 110eb0ff386db..915cde620c087 100644 --- a/util/prefix_helper.go +++ b/util/prefix_helper.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/util/types/compare.go b/util/types/compare.go index 5b9d898e7d052..9c655f2b8e646 100644 --- a/util/types/compare.go +++ b/util/types/compare.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/util/types/convert.go b/util/types/convert.go index ef515398ca7ee..ddf032888b386 100644 --- a/util/types/convert.go +++ b/util/types/convert.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/util/types/etc.go b/util/types/etc.go index 2375eb7915d13..a43c858154e57 100644 --- a/util/types/etc.go +++ b/util/types/etc.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // diff --git a/util/types/field_type.go b/util/types/field_type.go index db99bf944a8f5..6b69d40ead765 100644 --- a/util/types/field_type.go +++ b/util/types/field_type.go @@ -1,6 +1,6 @@ // Copyright 2014 The ql Authors. All rights reserved. // Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. +// license that can be found in the LICENSES/QL-LICENSE file. // Copyright 2015 PingCAP, Inc. // From c2436a201ac9ffe250c212b484a0c71f96d71bf4 Mon Sep 17 00:00:00 2001 From: qiuyesuifeng Date: Tue, 8 Sep 2015 19:34:44 +0800 Subject: [PATCH 2/2] README: update LICENSE link. improve document. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ccb2aa1981bc..218f8ea2d85c6 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ for details on submitting patches and the contribution workflow. Twitter: [@PingCAP](https://twitter.com/PingCAP) ## License -TiDB is under the Apache 2.0 license. See the [LICENSE](./LICENSE.md) file for details. +TiDB is under the Apache 2.0 license. See the [LICENSE](./LICENSES/LICENSE) file for details. ## Acknowledgments - Thanks [cznic](https://github.com/cznic) for providing some great open source tools.